Merge "Add some extra info to the notification list rows." into jb-mr2-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4668dd9..964650c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -69,6 +69,7 @@
             android:taskAffinity=""
             android:theme="@android:style/Theme.Holo"
             android:hardwareAccelerated="true"
+            android:requiredForAllUsers="true"
             android:supportsRtl="true">
 
         <!-- Settings -->
@@ -85,6 +86,16 @@
             </intent-filter>
         </activity>
 
+        <!-- User Restrictions activity -->
+
+        <activity android:name=".users.UserRestrictionsActivity"
+                android:label="@string/user_restrictions_title">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".SubSettings"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
@@ -734,6 +745,16 @@
             </intent-filter>
         </activity-alias>
 
+        <activity android:name=".users.AppRestrictionsFragment$Activity"
+                android:label="@string/application_info_label"
+                android:exported="true"
+                android:taskAffinity="">
+            <intent-filter>
+                <action android:name="com.android.settings.APP_RESTRICTIONS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <!-- Provide direct entry into manage apps showing running services. -->
         <activity android:name="Settings$RunningServicesActivity"
                 android:label="@string/runningservices_settings_title"
@@ -1179,6 +1200,15 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".wifi.WifiScanModeActivity"
+                  android:excludeFromRecents="true"
+                  android:theme="@style/Transparent">
+            <intent-filter>
+                <action android:name="android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".bluetooth.RequestPermissionHelperActivity"
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
@@ -1516,6 +1546,22 @@
                 android:resource="@id/display_settings" />
         </activity>
 
+        <activity android:name="Settings$UserSettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
+                android:label="@string/user_settings_title"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.USER_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.users.UserSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/user_settings" />
+        </activity>
+
         <receiver android:name=".widget.SettingsAppWidgetProvider"
                 android:label="@string/gadget_title"
                 android:exported="true"
@@ -1546,5 +1592,11 @@
             </intent-filter>
         </receiver>
 
+        <receiver android:name=".users.RestrictionsReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.GET_RESTRICTION_ENTRIES"/>
+            </intent-filter>
+        </receiver>
+
     </application>
 </manifest>
diff --git a/res/layout/preference_app_restrictions.xml b/res/layout/preference_app_restrictions.xml
new file mode 100644
index 0000000..a8a93d1
--- /dev/null
+++ b/res/layout/preference_app_restrictions.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingStart="@*android:dimen/preference_item_padding_side"
+    android:paddingEnd="?android:attr/scrollbarSize">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:id="@+id/app_restrictions_pref"
+        android:focusable="true"
+        android:clickable="true"
+        android:gravity="center_vertical"
+        android:background="?android:attr/selectableItemBackground" >
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:minWidth="@*android:dimen/preference_icon_minWidth"
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+android:id/icon"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center"
+                android:minWidth="48dp"
+                android:scaleType="centerInside"
+                android:layout_marginEnd="@*android:dimen/preference_item_padding_inner"
+                 />
+        </LinearLayout>
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="6dip"
+            android:layout_marginTop="6dip"
+            android:layout_marginBottom="6dip"
+            android:layout_weight="1">
+            <TextView
+                android:id="@+android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"/>
+            <TextView
+                android:id="@android:id/summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@android:id/title"
+                android:layout_alignStart="@android:id/title"
+                android:paddingBottom="3dip"
+                android:visibility="gone"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="13sp"
+                android:textColor="?android:attr/textColorSecondary"
+                android:focusable="false"
+                android:maxLines="4" />
+        </RelativeLayout>
+    </LinearLayout>
+    <ImageView
+        android:id="@+id/app_restrictions_settings"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingStart="12dip"
+        android:paddingEnd="12dp"
+        android:src="@drawable/ic_sysbar_quicksettings"
+        android:contentDescription="@string/apps_with_restrictions_settings_button"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackground" />
+    <View
+        android:id="@+id/settings_divider"
+        android:layout_width="1dip"
+        android:layout_height="match_parent"
+        android:layout_marginTop="5dip"
+        android:layout_marginBottom="5dip"
+        android:background="@android:drawable/divider_horizontal_dark" />
+
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingRight="?android:attr/scrollbarSize"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+</LinearLayout>
diff --git a/res/layout/preference_rename_widget.xml b/res/layout/preference_rename_widget.xml
new file mode 100644
index 0000000..81e401f
--- /dev/null
+++ b/res/layout/preference_rename_widget.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Layout for a text label in the user limits screen. -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/user_rename" />
diff --git a/res/layout/preference_user_delete_widget.xml b/res/layout/preference_user_delete_widget.xml
index 68355ba..57c240f 100644
--- a/res/layout/preference_user_delete_widget.xml
+++ b/res/layout/preference_user_delete_widget.xml
@@ -20,6 +20,16 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:orientation="horizontal">
+    <ImageView
+        android:id="@+id/manage_user"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingStart="12dip"
+        android:paddingEnd="12dip"
+        android:src="@drawable/ic_sysbar_quicksettings"
+        android:contentDescription="@string/user_delete_user_description"
+        android:layout_gravity="center"
+        android:background="?android:attr/selectableItemBackground" />
     <View
         android:layout_width="2dip"
         android:layout_height="match_parent"
@@ -30,8 +40,8 @@
         android:id="@+id/trash_user"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:paddingStart="15dip"
-        android:paddingEnd="?android:attr/scrollbarSize"
+        android:paddingStart="12dip"
+        android:paddingEnd="12dip"
         android:src="@drawable/ic_menu_delete_holo_dark"
         android:contentDescription="@string/user_delete_user_description"
         android:layout_gravity="center"
diff --git a/res/layout/user_limits.xml b/res/layout/user_limits.xml
new file mode 100644
index 0000000..b242f0e
--- /dev/null
+++ b/res/layout/user_limits.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:layout_marginStart="32dp"
+    android:layout_marginEnd="32dp"
+    android:orientation="vertical">
+
+    <fragment android:name="com.android.settings.users.AppRestrictionsFragment"
+            android:id="@+id/user_limits_fragment"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            />
+    <RelativeLayout
+            android:id="@+id/button_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0" >
+       <Button
+                android:id="@+id/back_button"
+                android:layout_width="150dip"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_margin="5dip"
+                android:text="@string/wizard_back"
+                android:visibility="invisible"/>
+
+       <Button
+               android:id="@+id/next_button"
+               android:layout_width="150dip"
+               android:layout_height="wrap_content"
+               android:layout_margin="5dip"
+               android:layout_alignParentEnd="true"
+               android:text="@string/wizard_finish" />
+    </RelativeLayout>
+</LinearLayout>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index effca06..d06bd76 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -218,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Ongespesifiseer"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interne toestelberging"</item>
     <item msgid="3738430123799803530">"Verwyderbare SD-kaart"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b216524..b2e341e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Stel my in kennis wanneer \'n oop netwerk beskikbaar is"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vermy swak verbindings"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Moenie \'n Wi-Fi-netwerk gebruik tensy dit \'n goeie internetverbinding het nie"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hou Wi-Fi aan tydens sluimer"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kon nie die instelling verander nie"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi-optimering"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN is geaktiveer"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN gedeaktiveer"</string>
     <string name="bearer" msgid="594270280031923558">"Draer"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Vee toegangspunt uit"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nuwe toegangspunt"</string>
     <string name="menu_save" msgid="8109345640668285399">"Stoor"</string>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 1f0d84a..d9675d0 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"ትልቅ"</item>
     <item msgid="7786168277516233536">"ግዙፍ"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"በጣም ቀርፋፋ"</item>
+    <item msgid="2361722960903353554">"አዘግይ"</item>
+    <item msgid="1145554631248513562">"መደበኛ"</item>
+    <item msgid="7553665153391107454">"ፈጣን"</item>
+    <item msgid="1370673569131070146">"የፈጠነ"</item>
+    <item msgid="4648206845228970803">"በጣም ፈጣን"</item>
+    <item msgid="4977949754169483251">"ፈጣን"</item>
+    <item msgid="6106302964845503577">"በጣም ፈጣን"</item>
+    <item msgid="6800277205640837264">"እጅግ በጣም ፈጣን"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"በጣም ዝቅተኛ"</item>
     <item msgid="2692137425242433765">"ዝቅ ያለ"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"ያልተገለጸ"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"የውስጥ መሣሪያ ማከማቻ"</item>
     <item msgid="3738430123799803530">"ተወጋጅ SD ካርድ"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 6ff672a..674f2a0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"ክፍት አውታረመረብ ሲገኝ አሳውቀኝ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ደካማ ግንኙነቶችን አስወግድ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"ጥሩ የበይነመረብ ግንኙነት ከሌለው በስተቀር የWi-Fi አውታረ መረብ አይጠቀሙ"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"በሚተኛበት Wi-Fi እንደበራ ይቆይ"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"ቅንብሮቹን ለመለወጥ ችግር ነበር።"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"የWi-Fi ማመቻቸት"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN ነቅቷል"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN ተሰናክሏል"</string>
     <string name="bearer" msgid="594270280031923558">"ተሸካሚ"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APN ሰርዝ"</string>
     <string name="menu_new" msgid="3014205883303921729">"አዲስ APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"አስቀምጥ"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 02dd7a9..aaa29c7 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"كبير"</item>
     <item msgid="7786168277516233536">"ضخم"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"بطيء للغاية"</item>
+    <item msgid="2361722960903353554">"بطيء"</item>
+    <item msgid="1145554631248513562">"عادي"</item>
+    <item msgid="7553665153391107454">"سريع"</item>
+    <item msgid="1370673569131070146">"أسرع"</item>
+    <item msgid="4648206845228970803">"سريع جدًا"</item>
+    <item msgid="4977949754169483251">"سريع"</item>
+    <item msgid="6106302964845503577">"سريع جدًا"</item>
+    <item msgid="6800277205640837264">"الأسرع"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"منخفضة جدًا"</item>
     <item msgid="2692137425242433765">"منخفضة"</item>
@@ -212,6 +218,12 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"غير محدد"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"None"</item>
+    <item msgid="6062567900587138000">"SPN"</item>
+    <item msgid="2454085083342423481">"IMSI"</item>
+    <item msgid="2681427309183221543">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"سعة تخزين الجهاز الداخلية"</item>
     <item msgid="3738430123799803530">"بطاقة SD قابلة للإزالة"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index dafab7f..5c878c5 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -540,6 +540,8 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"تنبيهي عند توفر شبكة مفتوحة"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"تجنب الاتصالات الضعيفة"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"عدم استخدام شبكات Wi-Fi ما لم يكن لها اتصال إنترنت جيد"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"إتاحة الفحص دائمًا"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"السماح لخدمة المواقع في Google والتطبيقات الأخرى بالفحص للوصول إلى شبكات، حتى عند عدم تشغيل Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"الاحتفاظ بتشغيل Wi-Fi أثناء وضع السكون"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"حدثت مشكلة أثناء تغيير الإعدادات"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"تحسين Wi-Fi"</string>
@@ -879,6 +881,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"تم تمكين APN"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"تم تعطيل APN"</string>
     <string name="bearer" msgid="594270280031923558">"الحامل"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"نوع MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"قيمة MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"حذف APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN جديد"</string>
     <string name="menu_save" msgid="8109345640668285399">"حفظ"</string>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index c72d8c0..faefdc9 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Вялікі"</item>
     <item msgid="7786168277516233536">"Вялiзны"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Вельмі павольная"</item>
+    <item msgid="2361722960903353554">"Павольная"</item>
+    <item msgid="1145554631248513562">"Звычайная"</item>
+    <item msgid="7553665153391107454">"Хуткая"</item>
+    <item msgid="1370673569131070146">"Хутчэй"</item>
+    <item msgid="4648206845228970803">"Вельмі хутка"</item>
+    <item msgid="4977949754169483251">"Хутка"</item>
+    <item msgid="6106302964845503577">"Вельмі хуткі"</item>
+    <item msgid="6800277205640837264">"Самы хуткі"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Вельмі нізкі"</item>
     <item msgid="2692137425242433765">"Нізкі"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Не пазначана"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Унутраная памяць прылады"</item>
     <item msgid="3738430123799803530">"Зменная SD-карта"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index ef4a7b4..9b1cdde 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Паведаміць мне, калі будзе даступная адкрытая сетка"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Пазбягаць дрэнных злучэнняў"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Не выкарыстоўваць сетку Wi-Fi, пакуль не будзе якаснага падключэння да Інтэрнэту"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Захоўваць Wi-Fi уключанай у рэжыме сну"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Была праблема змены налад"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Аптымiзацыя Wi-Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN уключаны"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN адключаны"</string>
     <string name="bearer" msgid="594270280031923558">"Прад\'яўнік"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Выдаліць APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Новы APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Захаваць"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index fc40925..8501aeb 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Голям"</item>
     <item msgid="7786168277516233536">"Огромен"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Много бавна"</item>
+    <item msgid="2361722960903353554">"Бавна"</item>
+    <item msgid="1145554631248513562">"Нормална"</item>
+    <item msgid="7553665153391107454">"Бърза"</item>
+    <item msgid="1370673569131070146">"По-бързо"</item>
+    <item msgid="4648206845228970803">"Много бързо"</item>
+    <item msgid="4977949754169483251">"Бързо"</item>
+    <item msgid="6106302964845503577">"Много бързо"</item>
+    <item msgid="6800277205640837264">"Най-бързо"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Много нисък"</item>
     <item msgid="2692137425242433765">"Нисък"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Неизвестен"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Вътрешно хранилище на устройство"</item>
     <item msgid="3738430123799803530">"SD карта, която може да се премахва"</item>
@@ -346,7 +356,7 @@
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"Изключено"</item>
-    <item msgid="675719912558941285">"Начерт. в синьо на неправоъг. обл."</item>
+    <item msgid="675719912558941285">"Начертаване в синьо на неправоъгълна област"</item>
     <item msgid="1064373276095698656">"Зелено за тест. команди за начерт."</item>
   </string-array>
   <string-array name="track_frame_time_entries">
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 9287846..ecd256a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Известие при налична отворена мрежа"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Да се избягват лоши връзки"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Да не се използва Wi‑Fi мрежа, освен ако няма добра връзка с интернет"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"С включен Wi‑Fi при спящ режим"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Възникна проблем при промяна на настройката"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi да се оптимизира"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Името на точката за достъп (APN) е активирано"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Името на точката за достъп (APN) е деактивирано"</string>
     <string name="bearer" msgid="594270280031923558">"Носител"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Изтриване на името на точката за достъп (APN)"</string>
     <string name="menu_new" msgid="3014205883303921729">"Ново име на точка за достъп (APN)"</string>
     <string name="menu_save" msgid="8109345640668285399">"Запазване"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index e7557e6..dcc9dc7 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Gran"</item>
     <item msgid="7786168277516233536">"Enorme"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Molt lenta"</item>
+    <item msgid="2361722960903353554">"Lenta"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Ràpida"</item>
+    <item msgid="1370673569131070146">"Més ràpida"</item>
+    <item msgid="4648206845228970803">"Molt ràpida"</item>
+    <item msgid="4977949754169483251">"Ràpida"</item>
+    <item msgid="6106302964845503577">"Molt ràpida"</item>
+    <item msgid="6800277205640837264">"Màxima"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Molt baix"</item>
     <item msgid="2692137425242433765">"Baixa"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"No especificat"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Emmagatzematge intern del dispositiu"</item>
     <item msgid="3738430123799803530">"Targeta SD extraïble"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c23106c..4499b1b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notifica\'m quan hi hagi una xarxa oberta disponible"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Només connexions estables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"No utilitzis una xarxa Wi-Fi tret que tingui una bona connexió a Internet"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Mantén la Wi-Fi activada durant el repòs"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"S\'ha produït un problema en canviar la configuració"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimització de Wi-Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN activat"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN desactivat"</string>
     <string name="bearer" msgid="594270280031923558">"Titular"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Suprimeix l\'APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN nou"</string>
     <string name="menu_save" msgid="8109345640668285399">"Desa"</string>
@@ -1196,7 +1204,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Configuració del teclat físic"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Premeu la tecla d\'espai dos cops per inserir \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Mostra les contrasenyes"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Pot ser que aquest mètode d\'entrada pugui recopilar tot el text que escrius, incloses dades personals, com ara contrasenyes i números de targetes de crèdit. Ve de l\'aplicació <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vols utilitzar aquest mètode d\'entrada?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Pot ser que aquest mètode d\'entrada pugui recopilar tot el que escriviu, incloses dades personals, com ara contrasenyes i números de targetes de crèdit. Ve de l\'aplicació <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Voleu utilitzar aquest mètode d\'entrada?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"És possible que aquest corrector ortogràfic pugui recopilar tot el text que escrius, la qual cosa inclou dades personals com ara les contrasenyes i els números de les targetes de crèdit. Prové de l\'aplicació <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vols fer servir aquest corrector ortogràfic?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Configuració"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index ad46761..84edca2 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Velké"</item>
     <item msgid="7786168277516233536">"Velmi velké"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Velmi pomalá"</item>
+    <item msgid="2361722960903353554">"Pomalá"</item>
+    <item msgid="1145554631248513562">"Běžná"</item>
+    <item msgid="7553665153391107454">"Rychlá"</item>
+    <item msgid="1370673569131070146">"Rychlejší"</item>
+    <item msgid="4648206845228970803">"Velmi rychlá"</item>
+    <item msgid="4977949754169483251">"Svižná"</item>
+    <item msgid="6106302964845503577">"Velmi svižná"</item>
+    <item msgid="6800277205640837264">"Nejrychlejší"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Velmi nízká"</item>
     <item msgid="2692137425242433765">"Nízká"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Nespecifikováno"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interní úložiště zařízení"</item>
     <item msgid="3738430123799803530">"Vyjímatelná karta SD"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index eda5161..5d2d5f5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Oznamovat dostupné nezabezpečené sítě"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Ignorovat slabá připojení"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Nepoužívat síť Wi-Fi, pokud nemá dostatečně kvalitní internetové připojení"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Ponechat Wi-Fi aktivní v režimu spánku"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Při změně nastavení se vyskytl problém"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimalizace Wi-Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Název přístupového bodu (APN) povolen"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Název přístupového bodu (APN) zakázán"</string>
     <string name="bearer" msgid="594270280031923558">"Nositel"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Smazat název přístupového bodu"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nový přístupový bod"</string>
     <string name="menu_save" msgid="8109345640668285399">"Uložit"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index a1aab5a..34c243a 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Stor"</item>
     <item msgid="7786168277516233536">"Meget stor"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Meget langsom"</item>
+    <item msgid="2361722960903353554">"Langsom"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Hurtig"</item>
+    <item msgid="1370673569131070146">"Hurtigere"</item>
+    <item msgid="4648206845228970803">"Meget hurtig"</item>
+    <item msgid="4977949754169483251">"Hurtig"</item>
+    <item msgid="6106302964845503577">"Meget hurtig"</item>
+    <item msgid="6800277205640837264">"Hurtigst"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Meget lav"</item>
     <item msgid="2692137425242433765">"Lav"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Ikke angivet"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Intern lagring på enheden"</item>
     <item msgid="3738430123799803530">"SD-kort, der kan fjernes"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d2aae1f..4e4d116 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Fortæl mig, når der er et tilgængeligt åbent netværk"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Undgå dårlige forbindelser"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Brug kun et Wi-Fi-netværk, hvis det har en god internetforbindelse"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hold Wi-Fi aktiveret i dvale"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Der opstod et problem ved ændring af indstillingen"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi-optimering"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Adgangspunktet er aktiveret"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Adgangspunktet er deaktiveret"</string>
     <string name="bearer" msgid="594270280031923558">"Bærer"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Slet APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Ny APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Gem"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 9b1221f..2117f7f 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Groß"</item>
     <item msgid="7786168277516233536">"Sehr groß"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Sehr langsam"</item>
+    <item msgid="2361722960903353554">"Langsam"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Schnell"</item>
+    <item msgid="1370673569131070146">"Schneller"</item>
+    <item msgid="4648206845228970803">"Sehr schnell"</item>
+    <item msgid="4977949754169483251">"Schnell"</item>
+    <item msgid="6106302964845503577">"Sehr schnell"</item>
+    <item msgid="6800277205640837264">"Am schnellsten"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Sehr niedrig"</item>
     <item msgid="2692137425242433765">"Niedrig"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Keine Angabe"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interner Gerätespeicher"</item>
     <item msgid="3738430123799803530">"Austauschbare SD-Karte"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f2fc54b..10fa29d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -541,6 +541,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Benachrichtigen, wenn ein offenes Netzwerk verfügbar ist"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Schlechte Internetverbindungen vermeiden"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"WLAN nur bei guter Internetverbindung verwenden"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"WLAN im Ruhemodus aktiviert lassen"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Beim Ändern der Einstellung ist ein Problem aufgetreten."</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"WLAN-Optimierung"</string>
@@ -880,6 +884,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN aktiviert"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN deaktiviert"</string>
     <string name="bearer" msgid="594270280031923558">"Träger"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APN löschen"</string>
     <string name="menu_new" msgid="3014205883303921729">"Neuer APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Speichern"</string>
@@ -1654,7 +1662,7 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Einsatz von GPU für 2D-Zeichnung erzwingen"</string>
     <string name="force_msaa" msgid="7920323238677284387">"4x MSAA erzwingen"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"4x MSAA in OpenGL ES 2.0-Apps aktivieren"</string>
-    <string name="show_non_rect_clip" msgid="505954950474595172">"Fehler bei nicht rechteckigen Clipoperationen beheben"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Nicht rechteckige Clip-Operationen debuggen"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"GPU-Rendering für Profil"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Maßstab Fensteranimation"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Maßstab Übergangsanimation"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index e19be54..8f6e1bc 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -70,11 +70,11 @@
     <item msgid="2361722960903353554">"Αργός"</item>
     <item msgid="1145554631248513562">"Κανονική"</item>
     <item msgid="7553665153391107454">"Γρήγορη"</item>
-    <item msgid="1370673569131070146">"Πιο γρήγορα"</item>
+    <item msgid="1370673569131070146">"Γρήγορα"</item>
     <item msgid="4648206845228970803">"Πολύ γρήγορα"</item>
-    <item msgid="4977949754169483251">"Γρήγορα"</item>
-    <item msgid="6106302964845503577">"Πολύ γρήγορα"</item>
-    <item msgid="6800277205640837264">"Πάρα πολύ γρήγορα"</item>
+    <item msgid="4977949754169483251">"Εξαιρετικά γρήγορα"</item>
+    <item msgid="6106302964845503577">"Πάρα πολύ γρήγορα"</item>
+    <item msgid="6800277205640837264">"Ταχύτατα"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Πολύ χαμηλός"</item>
@@ -218,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Δεν έχει καθοριστεί"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Εσωτερικός χώρος αποθήκευσης της συσκευής"</item>
     <item msgid="3738430123799803530">"Αφαιρούμενη κάρτα SD"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 63e895d..29ad675 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Να ειδοποιούμαι όταν υπάρχει διαθέσιμο ανοικτό δίκτυο"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Αποφυγή κακών συνδέσεων"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Να μην γίνεται χρήση δικτύων Wi-Fi, εκτός αν υπάρχει καλή σύνδεση στο Διαδίκτυο"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Να παραμένει ενεργοποιημένο το Wi-Fi κατά την αναστολή λειτουργίας"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Προέκυψε κάποιο πρόβλημα κατά την αλλαγή της ρύθμισης"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Βελτιστοποίηση Wi-Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Το APN έχει ενεργοποιηθεί"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Απενεργοποιημένο APN"</string>
     <string name="bearer" msgid="594270280031923558">"Φορέας"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Διαγραφή APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Νέο APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Αποθ/ση"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index b68ad5c..6576fa7 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -218,6 +218,12 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Unspecified"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"None"</item>
+    <item msgid="6062567900587138000">"SPN"</item>
+    <item msgid="2454085083342423481">"IMSI"</item>
+    <item msgid="2681427309183221543">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Internal device storage"</item>
     <item msgid="3738430123799803530">"Removable SD card"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e685446..015b215 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -540,6 +540,8 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notify me when an open network is available"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Avoid poor connections"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Don\'t use a Wi‑Fi network unless it has a good Internet connection"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanning always available"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Let Google\'s location service and other apps scan for networks, even when Wi-Fi is off"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Keep Wi‑Fi on during sleep"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"There was a problem while changing the setting"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi‑Fi optimisation"</string>
@@ -879,6 +881,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN enabled"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN disabled"</string>
     <string name="bearer" msgid="594270280031923558">"Bearer"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO type"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO value"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Delete APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"New APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Save"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 883aab3..d20c39e 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Grande"</item>
     <item msgid="7786168277516233536">"Enorme"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Muy lento"</item>
+    <item msgid="2361722960903353554">"Lento"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Rápido"</item>
+    <item msgid="1370673569131070146">"A mayor velocidad"</item>
+    <item msgid="4648206845228970803">"A velocidad muy alta"</item>
+    <item msgid="4977949754169483251">"Rápido"</item>
+    <item msgid="6106302964845503577">"Muy rápido"</item>
+    <item msgid="6800277205640837264">"A velocidad máxima"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Muy bajo"</item>
     <item msgid="2692137425242433765">"Bajo"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Sin especificar"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Dispositivo de almacenamiento interno"</item>
     <item msgid="3738430123799803530">"Tarjeta SD desmontable"</item>
@@ -346,8 +356,8 @@
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"Desactivado"</item>
-    <item msgid="675719912558941285">"Dibuj. reg. rec. no rectan. en azul"</item>
-    <item msgid="1064373276095698656">"Destac. comnds. dib. prob. en verde"</item>
+    <item msgid="675719912558941285">"Recorte no rectangular en azul"</item>
+    <item msgid="1064373276095698656">"Comandos de dib. probados en verde"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Desactivado"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e33963a..59c84d7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notificarme cuando se encuentre disponible una red abierta"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar malas conexiones"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Mantener Wi-Fi durante la suspensión"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Hubo un problema mientras se cambiaba la configuración"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimización de Wi-Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN activado"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN inhabilitado"</string>
     <string name="bearer" msgid="594270280031923558">"Portador"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Eliminar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN nuevo"</string>
     <string name="menu_save" msgid="8109345640668285399">"Guardar"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 19e492d..894d685 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -218,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Sin especificar"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Almacenamiento de dispositivo interno"</item>
     <item msgid="3738430123799803530">"Tarjeta SD extraíble"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9e2e79b..1bc1d94 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notificarme cuando haya una red abierta disponible"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Solo conexiones estables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Usar Wi-Fi en suspensión"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Error al cambiar la configuración"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimización de Wi‑Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN habilitado"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN inhabilitado"</string>
     <string name="bearer" msgid="594270280031923558">"Tipo de conexión"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Eliminar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nuevo APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Guardar"</string>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index d7deaa0..36c94c5 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Suur"</item>
     <item msgid="7786168277516233536">"Väga suur"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Väga aeglane"</item>
+    <item msgid="2361722960903353554">"Aeglane"</item>
+    <item msgid="1145554631248513562">"Tavaline"</item>
+    <item msgid="7553665153391107454">"Kiire"</item>
+    <item msgid="1370673569131070146">"Kiirem"</item>
+    <item msgid="4648206845228970803">"Väga kiire"</item>
+    <item msgid="4977949754169483251">"Kiire"</item>
+    <item msgid="6106302964845503577">"Väga kiire"</item>
+    <item msgid="6800277205640837264">"Kõige kiirem"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Väga madal"</item>
     <item msgid="2692137425242433765">"Madal"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Määramata"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Seadme sisemine salvestusruum"</item>
     <item msgid="3738430123799803530">"Eemaldatav SD-kaart"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 1a3de02..6286c02 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Teata mulle, kui avatud võrk on saadaval"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Väldi halbu ühendusi"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Ära kasuta WiFi-võrku, kui selle Interneti-ühendus on halb"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hoia WiFi unerežiimis sees"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Seade muutmisel tekkis probleem"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"WiFi optimeerimine"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN on lubatud"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN on keelatud"</string>
     <string name="bearer" msgid="594270280031923558">"Kandja"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Kustuta pääsupunktinimi"</string>
     <string name="menu_new" msgid="3014205883303921729">"Uus pääsupunktinimi"</string>
     <string name="menu_save" msgid="8109345640668285399">"Salvesta"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 226ae69..f6a7216 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"بزرگ"</item>
     <item msgid="7786168277516233536">"بسیار بزرگ"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"بسیار آهسته"</item>
+    <item msgid="2361722960903353554">"آهسته"</item>
+    <item msgid="1145554631248513562">"معمولی"</item>
+    <item msgid="7553665153391107454">"سریع"</item>
+    <item msgid="1370673569131070146">"سریعتر"</item>
+    <item msgid="4648206845228970803">"خیلی سریع"</item>
+    <item msgid="4977949754169483251">"تند"</item>
+    <item msgid="6106302964845503577">"خیلی تند"</item>
+    <item msgid="6800277205640837264">"سریعترین"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"بسیار کم"</item>
     <item msgid="2692137425242433765">"کم"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"مشخص نشده"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"دستگاه ذخیره‌سازی داخلی"</item>
     <item msgid="3738430123799803530">"کارت SD جدا شدنی"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 234349c..9ab9c81 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"هنگام در دسترس بودن یک شبکه باز، به من اعلام شود"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"اجتناب از اتصالات ضعیف"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"از شبکه Wi-Fi استفاده نکنید، مگر آنکه اتصال اینترنتی مناسب باشد"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"هنگام خواب، Wi-Fi را روشن بگذارید"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"هنگام تغییر تنظیمات مشکلی رخ داد"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"بهینه‌سازی Wi-Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN فعال شد"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN غیرفعال شد"</string>
     <string name="bearer" msgid="594270280031923558">"حامل"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"حذف APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN جدید"</string>
     <string name="menu_save" msgid="8109345640668285399">"ذخیره"</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index a1aa533..3f18931 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Suuri"</item>
     <item msgid="7786168277516233536">"Valtava"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Hyvin hidas"</item>
+    <item msgid="2361722960903353554">"Hidas"</item>
+    <item msgid="1145554631248513562">"Normaali"</item>
+    <item msgid="7553665153391107454">"Nopea"</item>
+    <item msgid="1370673569131070146">"Nopeampi"</item>
+    <item msgid="4648206845228970803">"Hyvin nopea"</item>
+    <item msgid="4977949754169483251">"Nopea"</item>
+    <item msgid="6106302964845503577">"Erittäin nopea"</item>
+    <item msgid="6800277205640837264">"Nopein"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Hyvin matala"</item>
     <item msgid="2692137425242433765">"Matala"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Määrittelemätön"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Laitteen sisäinen tallennustila"</item>
     <item msgid="3738430123799803530">"Poistettava SD-kortti"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 19b94e4..f58da88 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Ilmoita, kun avoin verkko on käytettävissä"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vältä huonoja yhteyksiä"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Älä käytä wifi-verkkoa, jos sillä on huono internetyhteys"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Pidä wifi käytössä virransäästötilassa"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Asetuksen vaihtaminen epäonnistui"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wifi-optimointi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN otettu käyttöön"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN poistettu käytöstä"</string>
     <string name="bearer" msgid="594270280031923558">"Bearer"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Poista APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Uusi APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Tallenna"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index a6ae896..858f539 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Grande"</item>
     <item msgid="7786168277516233536">"Très grande"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Très lente"</item>
+    <item msgid="2361722960903353554">"Lente"</item>
+    <item msgid="1145554631248513562">"Normale"</item>
+    <item msgid="7553665153391107454">"Rapide"</item>
+    <item msgid="1370673569131070146">"Plus rapide"</item>
+    <item msgid="4648206845228970803">"Très rapide"</item>
+    <item msgid="4977949754169483251">"Rapide"</item>
+    <item msgid="6106302964845503577">"Très rapide"</item>
+    <item msgid="6800277205640837264">"Le plus rapide"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Très grave"</item>
     <item msgid="2692137425242433765">"Grave"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Non spécifié"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Mémoire interne du mobile"</item>
     <item msgid="3738430123799803530">"Carte SD amovible"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 17d837b..90a0e39 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Me notifier lorsqu\'un réseau ouvert est disponible"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Éviter les connexions de mauvaise qualité"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Ne pas utiliser de réseau Wi-Fi, sauf en cas de connexion Internet de bonne qualité"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi actif en veille"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Un problème est survenu lors de la modification des paramètres."</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimisation du Wi-Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN activé"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN désactivé"</string>
     <string name="bearer" msgid="594270280031923558">"Réseau"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Supprimer l\'APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nouvel APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Enregistrer"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index cb68f4a..dae15b2 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"बड़ा"</item>
     <item msgid="7786168277516233536">"बहुत बड़ा"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"अत्‍यधिक धीमा"</item>
+    <item msgid="2361722960903353554">"धीमा"</item>
+    <item msgid="1145554631248513562">"सामान्य"</item>
+    <item msgid="7553665153391107454">"तेज़"</item>
+    <item msgid="1370673569131070146">"अधिक तेज़"</item>
+    <item msgid="4648206845228970803">"अत्‍यधिक तेज़"</item>
+    <item msgid="4977949754169483251">"त्वरित"</item>
+    <item msgid="6106302964845503577">"अत्यधिक त्वरित"</item>
+    <item msgid="6800277205640837264">"सबसे तेज़"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"अत्‍यधिक कम"</item>
     <item msgid="2692137425242433765">"निम्न"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"अनिर्दिष्ट"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"आंतरिक उपकरण संग्रहण"</item>
     <item msgid="3738430123799803530">"निकाले जाने योग्‍य SD कार्ड"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f6df6d9..4288c9f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"खुला नेटवर्क उपलब्‍ध होने पर मुझे सूचित करें"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"खराब कनेक्‍शन से बचें"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"जब तक Wi-Fi नेटवर्क में अच्छा इंटरनेट कनेक्‍शन न हो, तब तक उसका उपयोग न करें"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"निष्क्रिय रहने के दौरान Wi-Fi चालू रखें"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"सेटिंग बदलने में एक समस्‍या थी"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi ऑप्टिमाइज़ेशन"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN सक्षम"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN अक्षम"</string>
     <string name="bearer" msgid="594270280031923558">"धारक"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APN हटाएं"</string>
     <string name="menu_new" msgid="3014205883303921729">"नया APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"सहेजें"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 3e6ee3a..b44e955 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Velik"</item>
     <item msgid="7786168277516233536">"Ogroman"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Jako sporo"</item>
+    <item msgid="2361722960903353554">"Sporo"</item>
+    <item msgid="1145554631248513562">"Normalni"</item>
+    <item msgid="7553665153391107454">"Brzo"</item>
+    <item msgid="1370673569131070146">"Brže"</item>
+    <item msgid="4648206845228970803">"Vrlo brzo"</item>
+    <item msgid="4977949754169483251">"Ubrzano"</item>
+    <item msgid="6106302964845503577">"Vrlo ubrzano"</item>
+    <item msgid="6800277205640837264">"Najbrže"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Jako nisko"</item>
     <item msgid="2692137425242433765">"Niski"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Neodređeno"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interno pohranjivanje na uređaj"</item>
     <item msgid="3738430123799803530">"Prijenosna SD kartica"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1727402..b6d0bf8 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Obavijesti me ako postoji otvorena mreža"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izbjegavati slabe veze"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Ne upotrebljavaj Wi-Fi mrežu ako internetska veza nije zadovoljavajuća"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Zadrži Wi-Fi tijekom mirovanja"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pojavio se problem s promjenom postavke"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimizacija Wi-Fi-ja"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN omogućen"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN onemogućen"</string>
     <string name="bearer" msgid="594270280031923558">"Nositelj"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Izbriši APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Novi APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Spremi"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 8bdfda3..dc7f01d 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -218,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Nem meghatározott"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Belső tárhely"</item>
     <item msgid="3738430123799803530">"Eltávolítható SD-kártya"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4b634b4..940c4be 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Értesítést kérek az elérhető nyitott hálózatokról"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Rossz minőségű kapcsolatok kerülése"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Csak akkor használjon Wi-Fi hálózatot, ha jó internetkapcsolatot tud biztosítani."</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Tartsa bekapcsolva a Wi-Fit alvó üzemmódban"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Probléma adódott a beállítás megváltoztatásakor"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi optimalizálása"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN engedélyezve"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN kikapcsolva"</string>
     <string name="bearer" msgid="594270280031923558">"Tulajdonos"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APN törlése"</string>
     <string name="menu_new" msgid="3014205883303921729">"Új APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Mentés"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 8107dbe..3af74e9 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Besar"</item>
     <item msgid="7786168277516233536">"Raksasa"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Sangat lambat"</item>
+    <item msgid="2361722960903353554">"Lambat"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Cepat"</item>
+    <item msgid="1370673569131070146">"Lebih cepat"</item>
+    <item msgid="4648206845228970803">"Sangat cepat"</item>
+    <item msgid="4977949754169483251">"Cepat sekali"</item>
+    <item msgid="6106302964845503577">"Sangat cepat sekali"</item>
+    <item msgid="6800277205640837264">"Tercepat"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Sangat rendah"</item>
     <item msgid="2692137425242433765">"Rendah"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Tidak ditentukan"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Penyimpanan perangkat internal"</item>
     <item msgid="3738430123799803530">"Kartu SD yang dapat dicopot"</item>
@@ -346,7 +356,7 @@
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"Nonaktif"</item>
-    <item msgid="675719912558941285">"Gambar wilayah non-persegi biru"</item>
+    <item msgid="675719912558941285">"Gambar wilayah non-kotak biru"</item>
     <item msgid="1064373276095698656">"Sorot perintah gambar teruji hijau"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 1e800f9..72c78df 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Beri tahu saya ketika tersedia jaringan terbuka"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Hindari sambungan buruk"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Jangan gunakan jaringan Wi-Fi kecuali koneksi internetnya bagus"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Terus nyalakan Wi-Fi selama dalam mode tidur"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ada masalah saat mengubah setelan"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Pengoptimalan Wi-Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN diaktifkan"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN dinonaktifkan"</string>
     <string name="bearer" msgid="594270280031923558">"Operator"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Hapus APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN baru"</string>
     <string name="menu_save" msgid="8109345640668285399">"Simpan"</string>
@@ -1653,7 +1661,7 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Paksa penggunaan GPU untuk gambar 2d"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Force 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Aktifkan 4x MSAA dalam aplikasi OpenGL ES 2.0"</string>
-    <string name="show_non_rect_clip" msgid="505954950474595172">"Debug operasi klip non-persegi"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Debug operasi klip non-kotak"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Penguraian GPU profil"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animasi jendela"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala animasi transisi"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 98b9215..8763dc4 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Grandi"</item>
     <item msgid="7786168277516233536">"Molto grandi"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Molto lenta"</item>
+    <item msgid="2361722960903353554">"Lenta"</item>
+    <item msgid="1145554631248513562">"Normale"</item>
+    <item msgid="7553665153391107454">"Veloce"</item>
+    <item msgid="1370673569131070146">"Più veloce"</item>
+    <item msgid="4648206845228970803">"Molto veloce"</item>
+    <item msgid="4977949754169483251">"Rapida"</item>
+    <item msgid="6106302964845503577">"Molto rapida"</item>
+    <item msgid="6800277205640837264">"Massima velocità"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Molto basso"</item>
     <item msgid="2692137425242433765">"Basso"</item>
@@ -212,6 +218,12 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Non specificato"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"None"</item>
+    <item msgid="6062567900587138000">"SPN"</item>
+    <item msgid="2454085083342423481">"IMSI"</item>
+    <item msgid="2681427309183221543">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Memorizzazione su dispositivo interno"</item>
     <item msgid="3738430123799803530">"Scheda SD rimovibile"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 543c811..b918d99 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -540,6 +540,8 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Avvisa quando è disponibile una rete aperta"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evita connessioni deboli"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Non utilizzare una rete Wi‑Fi a meno che non abbia una buona connessione a Internet"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scansione sempre disponibile"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Consenti al servizio di localizzazione di Google e ad altre app di eseguire la scansione delle reti, anche quando il Wi-Fi non è attivo"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Tieni attivo Wi‑Fi durante sospensione"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Si è verificato un problema durante la modifica dell\'impostazione"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Ottimizzazione Wi‑Fi"</string>
@@ -879,6 +881,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN attivo"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN non attivo"</string>
     <string name="bearer" msgid="594270280031923558">"Bearer"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Tipo MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valore MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Elimina APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nuovo APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Salva"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index f23ffa5..63566bb 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"גדול"</item>
     <item msgid="7786168277516233536">"ענק"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"איטי מאוד"</item>
+    <item msgid="2361722960903353554">"איטי"</item>
+    <item msgid="1145554631248513562">"רגיל"</item>
+    <item msgid="7553665153391107454">"מהיר"</item>
+    <item msgid="1370673569131070146">"מהר יותר"</item>
+    <item msgid="4648206845228970803">"מהיר מאוד"</item>
+    <item msgid="4977949754169483251">"מהיר"</item>
+    <item msgid="6106302964845503577">"מהיר מאוד"</item>
+    <item msgid="6800277205640837264">"הכי מהיר"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"נמוך מאוד"</item>
     <item msgid="2692137425242433765">"נמוך"</item>
@@ -212,6 +218,12 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"לא צוין"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"ללא"</item>
+    <item msgid="6062567900587138000">"SPN"</item>
+    <item msgid="2454085083342423481">"IMSI"</item>
+    <item msgid="2681427309183221543">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"אחסון פנימי במכשיר"</item>
     <item msgid="3738430123799803530">"כרטיס SD נשלף"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 714c5a1..743e12d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -540,6 +540,8 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"שלח לי התראה כשיש רשת פתוחה זמינה"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"הימנע מחיבורים באיכות ירודה"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"אל תשתמש ברשת Wi-Fi, אלא אם יש לה חיבור אינטרנט באיכות טובה"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"סריקה זמינה תמיד"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"תן לשירות המיקום של Google וליישומים אחרים לסרוק על מנת למצוא רשתות, גם כש-Wi-Fi כבוי."</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"השאר את ה-Wi-Fi פועל בזמן שינה"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"אירעה בעיה בשינוי ההגדרה"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"אופטימיזציה ל-Wi-Fi"</string>
@@ -879,6 +881,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN מופעל"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN מושבת"</string>
     <string name="bearer" msgid="594270280031923558">"נושא"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"סוג MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"ערך MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"מחק APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"חדש APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"שמור"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 804bda9..f9ad5c3 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"大"</item>
     <item msgid="7786168277516233536">"極大"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"非常に遅い"</item>
+    <item msgid="2361722960903353554">"遅い"</item>
+    <item msgid="1145554631248513562">"標準"</item>
+    <item msgid="7553665153391107454">"速い"</item>
+    <item msgid="1370673569131070146">"より速い"</item>
+    <item msgid="4648206845228970803">"非常に速い"</item>
+    <item msgid="4977949754169483251">"高速"</item>
+    <item msgid="6106302964845503577">"非常に高速"</item>
+    <item msgid="6800277205640837264">"最高速"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"非常に低い"</item>
     <item msgid="2692137425242433765">"低い"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"指定なし"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"内部端末ストレージ"</item>
     <item msgid="3738430123799803530">"リムーバブルSDカード"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 21fa8b1..8236598 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -542,6 +542,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"オープンネットワークが利用可能なときに通知する"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"接続不良のとき無効にする"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"安定したインターネット接続があるときのみWi-Fiネットワークを使用する"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"スリープ時にWi-Fi接続を維持"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"設定の変更中に問題が発生しました"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi最適化"</string>
@@ -881,6 +885,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APNは有効です"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APNは無効です"</string>
     <string name="bearer" msgid="594270280031923558">"ベアラー"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APNを削除"</string>
     <string name="menu_new" msgid="3014205883303921729">"新しいAPN"</string>
     <string name="menu_save" msgid="8109345640668285399">"保存"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 5d420ab..672ffc5 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"크게"</item>
     <item msgid="7786168277516233536">"아주 크게"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"매우 느림"</item>
+    <item msgid="2361722960903353554">"느림"</item>
+    <item msgid="1145554631248513562">"보통"</item>
+    <item msgid="7553665153391107454">"빠름"</item>
+    <item msgid="1370673569131070146">"조금 빠름"</item>
+    <item msgid="4648206845228970803">"비교적 빠름"</item>
+    <item msgid="4977949754169483251">"상당히 빠름"</item>
+    <item msgid="6106302964845503577">"매우 빠름"</item>
+    <item msgid="6800277205640837264">"가장 빠름"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"매우 낮음"</item>
     <item msgid="2692137425242433765">"낮음"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"지정되지 않음"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"내부 기기 저장용량"</item>
     <item msgid="3738430123799803530">"이동식 SD 카드"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a407774..420d8fb 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"개방형 네트워크를 사용할 수 있을 때 알림"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"불량 네트워크 방지"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"인터넷 연결이 원활하지 않은 경우 Wi-Fi 네트워크를 사용하지 않음"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"절전 모드 동안 Wi-Fi 연결 유지"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"설정을 변경하는 중 문제가 발생했습니다."</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi 최적화"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN 사용"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN 사용 중지됨"</string>
     <string name="bearer" msgid="594270280031923558">"베어러(Bearer)"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APN 삭제"</string>
     <string name="menu_new" msgid="3014205883303921729">"새 APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"저장"</string>
@@ -976,10 +984,10 @@
     <string name="contributors_title" msgid="5917703088825286504">"도움을 주신 분들"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"규정 정보"</string>
     <string name="copyright_title" msgid="865906688917260647">"저작권"</string>
-    <string name="license_title" msgid="1990487604356037871">"라이센스"</string>
+    <string name="license_title" msgid="1990487604356037871">"라이선스"</string>
     <string name="terms_title" msgid="7697580845616764642">"약관"</string>
-    <string name="settings_license_activity_title" msgid="7553683406244228650">"오픈소스 라이센스"</string>
-    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"라이센스를 로드하는 동안 문제가 발생했습니다."</string>
+    <string name="settings_license_activity_title" msgid="7553683406244228650">"오픈소스 라이선스"</string>
+    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"라이선스를 로드하는 동안 문제가 발생했습니다."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"로드 중..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"안전 정보"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"안전 정보"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index d348268..4c1ee7a 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Didelis"</item>
     <item msgid="7786168277516233536">"Didžiulis"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Labai lėtas"</item>
+    <item msgid="2361722960903353554">"Lėtas"</item>
+    <item msgid="1145554631248513562">"Įprastas"</item>
+    <item msgid="7553665153391107454">"Greitas"</item>
+    <item msgid="1370673569131070146">"Greitesnis"</item>
+    <item msgid="4648206845228970803">"Labai greitas"</item>
+    <item msgid="4977949754169483251">"Spartus"</item>
+    <item msgid="6106302964845503577">"Labai spartus"</item>
+    <item msgid="6800277205640837264">"Greičiausias"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Visiškai senka"</item>
     <item msgid="2692137425242433765">"Žemas"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Nenurodyta"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Vidinė įrenginio saugykla"</item>
     <item msgid="3738430123799803530">"Keičiama SD kortelė"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 72264a2..ba825d5 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Pranešti, kai bus galimas atviras tinklas"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vengti prasto ryšio"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Nenaudoti „Wi-Fi“ tinklo, jei jo interneto ryšys nėra geras"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Išlaikyti „Wi-Fi“ įjungtą, kai veikia miego režimas"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Keičiant nustatymą kilo problemų"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"„Wi-Fi“ optimizavimas"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN įgalinta"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN neleidžiama"</string>
     <string name="bearer" msgid="594270280031923558">"Nešiklis"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Ištrinti APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Naujas APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Išsaugoti"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 1faf834..62ea740 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Liels"</item>
     <item msgid="7786168277516233536">"Milzīgs"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Ļoti lēni"</item>
+    <item msgid="2361722960903353554">"Lēni"</item>
+    <item msgid="1145554631248513562">"Normāli"</item>
+    <item msgid="7553665153391107454">"Ātri"</item>
+    <item msgid="1370673569131070146">"Ātrāk"</item>
+    <item msgid="4648206845228970803">"Ļoti ātri"</item>
+    <item msgid="4977949754169483251">"Raiti"</item>
+    <item msgid="6106302964845503577">"Ļoti raiti"</item>
+    <item msgid="6800277205640837264">"Visātrāk"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Ļoti zems"</item>
     <item msgid="2692137425242433765">"Zema"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Nav noteikts"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Iekšējā ierīces krātuve"</item>
     <item msgid="3738430123799803530">"Izņemama SD karte"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 7139262..3dfb1f5 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Informēt mani, kad ir pieejams atvērts tīkls"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Nelietot vājus savienojumus"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Nelietot Wi-Fi tīklu, ja vien tam nav labs interneta savienojums"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Aktivizēt Wi-Fi arī miega režīmā"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Mainot iestatījumu, radās kļūda"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi optimizācija"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN ir iespējots"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN ir atspējots"</string>
     <string name="bearer" msgid="594270280031923558">"Nesējs"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Dzēst APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Jauns APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Saglabāt"</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index ea30165..97fddbe 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Besar"</item>
     <item msgid="7786168277516233536">"Sangat besar"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Sangat perlahan"</item>
+    <item msgid="2361722960903353554">"Perlahan"</item>
+    <item msgid="1145554631248513562">"Biasa"</item>
+    <item msgid="7553665153391107454">"Laju"</item>
+    <item msgid="1370673569131070146">"Lebih cepat"</item>
+    <item msgid="4648206845228970803">"Sangat cepat"</item>
+    <item msgid="4977949754169483251">"Cepat"</item>
+    <item msgid="6106302964845503577">"Sangat cepat"</item>
+    <item msgid="6800277205640837264">"Terpantas"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Sangat rendah"</item>
     <item msgid="2692137425242433765">"Rendah"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Tidak ditentukan"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Storan dalaman peranti"</item>
     <item msgid="3738430123799803530">"Kad SD boleh tanggal"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index cd545c8..37558f9 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Beritahu saya apabila rangkaian terbuka tersedia"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Elakkan sambungan lemah"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Jangan gunakan rangkaian Wi-Fi melainkan jika rangkaian itu mempunyai sambungan internet yang baik"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Biarkan Wi-Fi aktif semasa tidur"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Terdapat masalah menukar tetapan"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Pengoptimuman Wi‑Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN didayakan"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN dilumpuhkan"</string>
     <string name="bearer" msgid="594270280031923558">"Pembawa"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Padam APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN Baru"</string>
     <string name="menu_save" msgid="8109345640668285399">"Simpan"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 0f58177..6395a89 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Stor"</item>
     <item msgid="7786168277516233536">"Diger"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Svært langsom"</item>
+    <item msgid="2361722960903353554">"Langsom"</item>
+    <item msgid="1145554631248513562">"Vanlig"</item>
+    <item msgid="7553665153391107454">"Rask"</item>
+    <item msgid="1370673569131070146">"Raskere"</item>
+    <item msgid="4648206845228970803">"Veldig rask"</item>
+    <item msgid="4977949754169483251">"Rask"</item>
+    <item msgid="6106302964845503577">"Veldig rask"</item>
+    <item msgid="6800277205640837264">"Raskest"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Svært lav"</item>
     <item msgid="2692137425242433765">"Lav"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Uspesifisert"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Intern lagringsenhet"</item>
     <item msgid="3738430123799803530">"Flyttbart minnekort"</item>
@@ -346,8 +356,8 @@
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"Av"</item>
-    <item msgid="675719912558941285">"Tegn område for ikke-rektangulær klipping i blått"</item>
-    <item msgid="1064373276095698656">"Uthev testede tegnekommandoer i grønt"</item>
+    <item msgid="675719912558941285">"Merk område for ikke-rektangulær klipping blått"</item>
+    <item msgid="1064373276095698656">"Uthev testede tegnekommandoer grønt"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Av"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index deecc2c..605474f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Varsle når et åpent nettverk er tilgjengelig"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Unngå dårlige tilkoblinger"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Ikke bruk et Wi-Fi-nettverk med mindre det har en brukbar Internett-tilkobling"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hold Wi-Fi aktivert i dvalemodus"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Det oppstod et problem under endring av innstillingen"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimalisering av Wi-Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN aktivert"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN er deaktivert"</string>
     <string name="bearer" msgid="594270280031923558">"Bærer"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Slett APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nytt APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Lagre"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 7962735..4f64983 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -218,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Niet opgegeven"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interne apparaatopslag"</item>
     <item msgid="3738430123799803530">"Verwisselbare SD-kaart"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0aed0e0..1106e09 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Melden wanneer een open netwerk beschikbaar is"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Slechte verbindingen vermijden"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Wifi-netwerk niet gebruiken, tenzij dit een goede internetverbinding heeft"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wifi behouden in slaapstand"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Er is een probleem opgetreden bij het wijzigen van de instelling"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wifi-optimalisatie"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN ingeschakeld"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN uitgeschakeld"</string>
     <string name="bearer" msgid="594270280031923558">"Drager"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APN verwijderen"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nieuwe APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Opslaan"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 6fce83e..89c456f 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Duży"</item>
     <item msgid="7786168277516233536">"Ogromny"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Bardzo wolno"</item>
+    <item msgid="2361722960903353554">"Wolno"</item>
+    <item msgid="1145554631248513562">"Normalnie"</item>
+    <item msgid="7553665153391107454">"Szybko"</item>
+    <item msgid="1370673569131070146">"Trochę szybciej"</item>
+    <item msgid="4648206845228970803">"Szybciej"</item>
+    <item msgid="4977949754169483251">"Jeszcze szybciej"</item>
+    <item msgid="6106302964845503577">"Bardzo szybko"</item>
+    <item msgid="6800277205640837264">"Najszybciej"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Bardzo niskie"</item>
     <item msgid="2692137425242433765">"Niskie"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Nie określono"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Wewnętrzna pamięć urządzenia"</item>
     <item msgid="3738430123799803530">"Wymienna karta SD"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2b47b67..e4e9ec6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Powiadom mnie, gdy będę w zasięgu otwartej sieci"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Unikaj słabych połączeń"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Nie używaj sieci Wi-Fi, jeśli połączenie jest słabe"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Nie wyłączaj Wi-Fi w trybie uśpienia"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Wystąpił problem ze zmianą ustawienia"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optymalizacja Wi-Fi"</string>
@@ -610,8 +614,8 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"Anuluj"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Pomiń mimo to"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Nie pomijaj"</string>
-    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"OSTRZEŻENIE: operator może naliczyć dodatkowe opłaty za transmisję danych."\n\n"Konfiguracja tabletu może wymagać częstego korzystania z sieci."</string>
-    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"OSTRZEŻENIE: operator może naliczyć dodatkowe opłaty za transmisję danych."\n\n"Konfiguracja telefonu może wymagać częstego korzystania z sieci."</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"OSTRZEŻENIE: operator może naliczyć dodatkowe opłaty za transmisję danych."\n\n"Konfiguracja tabletu może wymagać przesłania dużej ilości informacji."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"OSTRZEŻENIE: operator może naliczyć dodatkowe opłaty za transmisję danych."\n\n"Konfiguracja telefonu może wymagać przesłania dużej ilości informacji."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"OSTRZEŻENIE: aby sprawdzić, czy oprogramowanie jest aktualne, tablet musi mieć połączenie z internetem."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"OSTRZEŻENIE: aby sprawdzić, czy oprogramowanie jest aktualne, telefon musi mieć połączenie z internetem."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN włączona"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN wyłączona"</string>
     <string name="bearer" msgid="594270280031923558">"Nośnik"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Usuń APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nowy APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Zapisz"</string>
@@ -1076,7 +1084,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaż procesy z pamięci podręcznej"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Resetuj opcje aplikacji"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Zresetować opcje aplikacji?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Wszystkie te ustawienia zostaną zresetowane:"\n\n" "<li>"wyłączone aplikacje,"</li>\n" "<li>"wyłączone powiadomienia aplikacji,"</li>\n" "<li>"aplikacje używane domyślnie do wykonania czynności,"</li>\n" "<li>"ograniczenia użycia danych w tle w aplikacjach."</li>\n\n" Nie utracisz żadnych danych aplikacji."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Zresetowane będą wszystkie ustawienia:"\n\n" "<li>"Wyłączone aplikacje"</li>\n" "<li>"Wyłączone powiadomienia aplikacji"</li>\n" "<li>"Aplikacje domyślne"</li>\n" "<li>"Ograniczenia użycia danych w tle dla aplikacji."</li>\n\n" Nie utracisz żadnych danych."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetuj aplikacje"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Zarządzaj rozmiarem"</string>
     <string name="filter" msgid="2018011724373033887">"Filtr"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index e52a79c..267fe34 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Grande"</item>
     <item msgid="7786168277516233536">"Enorme"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Muito lenta"</item>
+    <item msgid="2361722960903353554">"Lenta"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Rápida"</item>
+    <item msgid="1370673569131070146">"Mais Rápida"</item>
+    <item msgid="4648206845228970803">"Muito rápida"</item>
+    <item msgid="4977949754169483251">"Rápida"</item>
+    <item msgid="6106302964845503577">"Muito rápida"</item>
+    <item msgid="6800277205640837264">"A Mais Rápida"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Muito baixa"</item>
     <item msgid="2692137425242433765">"Baixa"</item>
@@ -212,6 +218,12 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Não especificado"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Nenhum"</item>
+    <item msgid="6062567900587138000">"SPN"</item>
+    <item msgid="2454085083342423481">"IMSI"</item>
+    <item msgid="2681427309183221543">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Armazenamento de dispositivo interno"</item>
     <item msgid="3738430123799803530">"Cartão SD amovível"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9c2d1e6..c0e75ba 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -540,6 +540,8 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notificar-me quando estiver disponível uma rede aberta"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar más ligações"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Não utilizar uma rede Wi-Fi exceto se tiver uma boa ligação à Internet"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Procura de redes sempre disponível"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Permitir que o serviço de localização da Google e outras aplicações procurem redes, mesmo quando a ligação Wi-Fi está desativada"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi ligada durante suspensão"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema ao alterar a definição"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Otimização de Wi-Fi"</string>
@@ -879,6 +881,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN ativado"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN desativado"</string>
     <string name="bearer" msgid="594270280031923558">"Portador"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Tipo de MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valor da MVNO (Operadora Móvel com Rede Virtual)"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Eliminar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Novo APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Guardar"</string>
@@ -956,7 +960,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
     <string name="location_title" msgid="1029961368397484576">"A minha localização"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi e localização de rede de telemóvel"</string>
-    <string name="location_neighborhood_level" msgid="5626515380188353712">"Permita que aplic. usem o serv. localiz. Google para calcular mais rapidamente a sua local. Rec. dados anónimos e env. à Google."</string>
+    <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que aplic. usem o serv. localiz. Google p/ calcular mais rapida/ a sua localização. Dados localização recolhidos e enviados à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localização determinada por Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satélites GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permita que as aplicações utilizem o GPS do tablet para localizar a sua posição"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 455e8f0..da24df8 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Grande"</item>
     <item msgid="7786168277516233536">"Enorme"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Muito devagar"</item>
+    <item msgid="2361722960903353554">"Devagar"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Rápida"</item>
+    <item msgid="1370673569131070146">"Mais rápida"</item>
+    <item msgid="4648206845228970803">"Muito rápida"</item>
+    <item msgid="4977949754169483251">"Rápida"</item>
+    <item msgid="6106302964845503577">"Muito rápida"</item>
+    <item msgid="6800277205640837264">"Máxima"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Muito baixa"</item>
     <item msgid="2692137425242433765">"Baixa"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Não especificado"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Armazenamento do dispositivo interno"</item>
     <item msgid="3738430123799803530">"Cartão SD removível"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b1ea51a..70cd12f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Receber notificação quando uma rede aberta estiver disponível"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar conexões de baixa qualidade"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Não usar uma rede Wi-Fi a menos que tenha uma boa conexão com a Internet"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi durante inatividade"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema com a mudança de configuração"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Otimização de Wi-Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN ativado"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN desativado"</string>
     <string name="bearer" msgid="594270280031923558">"Portador"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Excluir APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Novo APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Salvar"</string>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index b0d375b..436d800 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -146,6 +146,10 @@
     <!-- no translation found for bearer_entries:0 (1770285336669531300) -->
     <!-- no translation found for bearer_entries:1 (3044323519470167625) -->
     <!-- no translation found for bearer_entries:2 (6848428671997893147) -->
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Memoria interna da telefonin"</item>
     <item msgid="3738430123799803530">"Carta SD che po vegnir barattada"</item>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 6f3926b..6265900 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -803,6 +803,10 @@
     <skip />
     <!-- no translation found for wifi_poor_network_detection_summary (7843672905900544785) -->
     <skip />
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <!-- no translation found for wifi_setting_sleep_policy_title (5149574280392680092) -->
     <skip />
     <!-- no translation found for wifi_setting_sleep_policy_error (8174902072673071961) -->
@@ -1337,6 +1341,10 @@
     <skip />
     <!-- no translation found for bearer (594270280031923558) -->
     <skip />
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Stizzar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nov APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Memorisar"</string>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 8b78d5c..6b12cf7 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Mare"</item>
     <item msgid="7786168277516233536">"Foarte mare"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Foarte încet"</item>
+    <item msgid="2361722960903353554">"Încet"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Rapid"</item>
+    <item msgid="1370673569131070146">"Mai repede"</item>
+    <item msgid="4648206845228970803">"Foarte repede"</item>
+    <item msgid="4977949754169483251">"Rapid"</item>
+    <item msgid="6106302964845503577">"Foarte rapid"</item>
+    <item msgid="6800277205640837264">"Cel mai repede"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Foarte scăzut"</item>
     <item msgid="2692137425242433765">"Redusă"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Nespecificat"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Stocare internă pe dispozitiv"</item>
     <item msgid="3738430123799803530">"Card SD detaşabil"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 0ec8c7f..b124062 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -28,7 +28,7 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Aţi devenit dezvoltator!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nu mai este nevoie, sunteţi deja dezvoltator."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS ŞI REŢELE"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS ȘI REŢELE"</string>
     <string name="header_category_device" msgid="5781174212691167553">"DISPOZITIV"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
     <string name="header_category_system" msgid="2073558547468647128">"SISTEM"</string>
@@ -66,8 +66,8 @@
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
     <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Demontaţi stocarea USB"</string>
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Demontaţi cardul SD"</string>
-    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Ştergeţi stocarea USB"</string>
-    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Ştergeţi cardul SD"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Ștergeţi stocarea USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Ștergeţi cardul SD"</string>
     <string name="small_font" msgid="2295331917424072635">"Mică"</string>
     <string name="medium_font" msgid="2068475425515133701">"Medie"</string>
     <string name="large_font" msgid="599055175160971446">"Mare"</string>
@@ -179,7 +179,7 @@
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Cont:"</string>
     <string name="proxy_settings_title" msgid="5912878565897294401">"Setări proxy"</string>
-    <string name="proxy_clear_text" msgid="5555400754952012657">"Ştergeţi"</string>
+    <string name="proxy_clear_text" msgid="5555400754952012657">"Ștergeţi"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Evitaţi utilizarea unui proxy pentru"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Doresc să fiu notificat când este disponibilă o reţea deschisă"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitaţi conexiunile slabe"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Nu utilizați o reţea Wi-Fi, cu excepția cazului în care aceasta are o conexiune la internet adecvată"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Mențineți Wi-Fi activat în modul inactiv"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"A apărut o problemă la modificarea setării"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimizare Wi-Fi"</string>
@@ -820,11 +824,11 @@
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Montaţi cardul SD"</string>
     <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
-    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Ştergeţi stocarea USB"</string>
-    <string name="sd_format" product="default" msgid="2576054280507119870">"Ştergeţi cardul SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Şterge toate datele din stocarea USB internă, cum ar fi muzica şi fotografiile"</string>
-    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Şterge toate datele de pe cardul SD, cum ar fi muzica şi fotografiile"</string>
-    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Ştergeţi datele memorate în cache?"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Ștergeţi stocarea USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Ștergeţi cardul SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Șterge toate datele din stocarea USB internă, cum ar fi muzica şi fotografiile"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Șterge toate datele de pe cardul SD, cum ar fi muzica şi fotografiile"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Ștergeţi datele memorate în cache?"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"Datele din cache ale aplicaţiilor vor fi şterse."</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Funcţia MTP sau PTP este activă"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Demontaţi stocarea USB?"</string>
@@ -879,7 +883,11 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN activat"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN dezactivat"</string>
     <string name="bearer" msgid="594270280031923558">"Purtător"</string>
-    <string name="menu_delete" msgid="6981294422841124659">"Ştergeţi APN"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
+    <string name="menu_delete" msgid="6981294422841124659">"Ștergeţi APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN nou"</string>
     <string name="menu_save" msgid="8109345640668285399">"Salvaţi"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"Renunţaţi"</string>
@@ -892,37 +900,37 @@
     <string name="menu_restore" msgid="8260067415075573273">"Resetaţi la valorile prestabilite"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Resetarea setărilor APN prestabilite a fost finalizată."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Resetarea configurării din fabrică"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Şterge toate datele de pe tabletă"</string>
-    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Şterge toate datele de pe telefon"</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Șterge toate datele de pe tabletă"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Șterge toate datele de pe telefon"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a tabletei dvs., inclusiv:"\n\n<li>"Contul dvs. Google;"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor;"</li>\n<li>"aplicaţiile descărcate."</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a telefonului dvs., inclusiv:"\n\n<li>"Contul dvs. Google;"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor;"</li>\n<li>"aplicaţiile descărcate."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"În prezent sunteţi conectat(ă) la următoarele conturi:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzică"</li>\n<li>"Fotografii"</li>\n<li>"Alte date ale utilizatorului"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ştearsă."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie şters."</string>
-    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ştergeţi stocarea USB"</string>
-    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ştergeţi cardul SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ştergeţi toate datele din stocarea USB internă, cum ar fi muzica sau fotografiile"</string>
-    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ştergeţi toate datele de pe cardul SD, cum ar fi muzica sau fotografiile"</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ștergeţi stocarea USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ștergeţi cardul SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ștergeţi toate datele din stocarea USB internă, cum ar fi muzica sau fotografiile"</string>
+    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ștergeţi toate datele de pe cardul SD, cum ar fi muzica sau fotografiile"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetaţi tableta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetaţi telefonul"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Ştergeţi toate informaţiile personale şi aplicaţiile descărcate? Nu puteţi anula această acţiune!"</string>
-    <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ştergeţi tot"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"Ștergeţi toate informaţiile personale şi aplicaţiile descărcate? Nu puteţi anula această acţiune!"</string>
+    <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ștergeţi tot"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenaţi modelul pentru deblocare"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Trebuie să desenaţi modelul de deblocare pentru a confirma resetarea configurării din fabrică."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nu a fost efectuată nicio resetare, deoarece serviciul Golire sistem nu este disponibil."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Resetaţi?"</string>
-    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ştergeţi stocarea USB"</string>
-    <string name="media_format_title" product="default" msgid="4427528440306787972">"Ştergeţi cardul SD"</string>
-    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Şterge datele din stocarea USB"</string>
-    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Ştergeţi toate datele de pe cardul SD"</string>
-    <string name="media_format_desc" product="nosdcard" msgid="4557243156946319034">"Ştergeţi integral stocarea USB? Veţi pierde "<b>"toate"</b>" datele stocate!"</string>
-    <string name="media_format_desc" product="default" msgid="8764037252319942415">"Ştergeţi cardul SD? Veţi pierde "<b>"toate"</b>" datele de pe card!"</string>
-    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Ştergeţi stocarea USB"</string>
-    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Ştergeţi cardul SD"</string>
-    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Ştergeţi stocarea USB şi toate fişierele stocate pe aceasta? Nu puteţi anula această acţiune!"</string>
-    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ştergeţi cardul SD şi toate fişierele stocate pe acesta? Acţiunea nu poate fi anulată!"</string>
-    <string name="media_format_final_button_text" msgid="4881713344315923175">"Ştergeţi tot"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ștergeţi stocarea USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Ștergeţi cardul SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Șterge datele din stocarea USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Ștergeţi toate datele de pe cardul SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4557243156946319034">"Ștergeţi integral stocarea USB? Veţi pierde "<b>"toate"</b>" datele stocate!"</string>
+    <string name="media_format_desc" product="default" msgid="8764037252319942415">"Ștergeţi cardul SD? Veţi pierde "<b>"toate"</b>" datele de pe card!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Ștergeţi stocarea USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Ștergeţi cardul SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Ștergeţi stocarea USB şi toate fişierele stocate pe aceasta? Nu puteţi anula această acţiune!"</string>
+    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ștergeţi cardul SD şi toate fişierele stocate pe acesta? Acţiunea nu poate fi anulată!"</string>
+    <string name="media_format_final_button_text" msgid="4881713344315923175">"Ștergeţi tot"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenaţi modelul pentru deblocare"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Trebuie să desenaţi modelul de deblocare pentru a confirma că doriţi să ştergeţi stocarea USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Trebuie să desenaţi modelul de deblocare pentru a confirma că doriţi să ştergeţi cardul SD."</string>
@@ -1060,12 +1068,12 @@
     <string name="install_text" msgid="884360662922471113">"Instalaţi"</string>
     <string name="disable_text" msgid="6544054052049395202">"Dezactivaţi"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activaţi"</string>
-    <string name="clear_user_data_text" msgid="5597622864770098388">"Ştergeţi datele"</string>
+    <string name="clear_user_data_text" msgid="5597622864770098388">"Ștergeţi datele"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Dezinstalaţi actualizările"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Aţi ales să lansaţi această aplicaţie în mod prestabilit pentru anumite acţiuni."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Aţi ales să permiteţi acestei aplicaţii să creeze widgeturi şi să acceseze datele acestora."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nu este setată nicio valoare standard."</string>
-    <string name="clear_activities" msgid="7408923511535174430">"Ştergeţi valorile standard"</string>
+    <string name="clear_activities" msgid="7408923511535174430">"Ștergeţi valorile standard"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Este posibil ca această aplicaţie să nu fie proiectată pentru ecranul dvs. Aici puteţi stabili modul în care aceasta se adaptează ecranului dvs."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Se stabileşte la lansare"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Scalaţi aplicaţia"</string>
@@ -1094,7 +1102,7 @@
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Stocare USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Stocare card SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Se recalculează dimensiunea..."</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Ştergeţi datele aplicaţiei?"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Ștergeţi datele aplicaţiei?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"Toate datele acestei aplicaţii vor fi şterse definitiv. Aici sunt incluse toate fişierele, setările, conturile, bazele de date etc."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Anulaţi"</string>
@@ -1103,7 +1111,7 @@
     <string name="clear_data_failed" msgid="1907582169616856698">"Nu s-au putut şterge datele aplicaţiei."</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Dezinstalaţi actualizările?"</string>
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Toate actualizările aduse acestei aplicaţii de sistem Android vor fi dezinstalate."</string>
-    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Ştergeţi datele"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Ștergeţi datele"</string>
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Nu s-au putut şterge datele aplicaţiei."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Această aplicaţie poate accesa pe tabletă următoarele:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Această aplicaţie poate accesa următoarele elemente de pe telefonul dvs.:"</string>
@@ -1138,7 +1146,7 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Schimbaţi locaţia preferată de instalare pentru noile aplicaţii"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Dezactiv. aplic. încorporată?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Dacă dezactivaţi o aplicaţie încorporată, este posibil ca alte aplicaţii să se comporte necorespunzător."</string>
-    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Ştergeţi datele şi dezactivaţi aplicaţia?"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Ștergeţi datele şi dezactivaţi aplicaţia?"</string>
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Dacă dezactivaţi o aplicaţie încorporată, este posibil ca alte aplicaţii să funcţioneze incorect. Datele dvs. vor fi, de asemenea, şterse."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Dezactivaţi notificările?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Dacă dezactivaţi notificările pentru această aplicaţie, puteţi pierde alerte şi actualizări importante."</string>
@@ -1183,7 +1191,7 @@
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale tabletei să nu mai funcţioneze corect decât după ce o veţi închide şi redeschide."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale telefonului să nu mai funcţioneze corect decât după ce îl veţi închide şi redeschide."</string>
     <string name="language_settings" msgid="5292716747264442359">"Limbă și introducere de text"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Limbă și metodă de introducere de text"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Limbă și introducere de text"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Setări de limbă"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatură şi metode de introducere de text"</string>
     <string name="phone_language" msgid="8870144109924299673">"Limba"</string>
@@ -1227,7 +1235,7 @@
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Limbă:"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modificaţi cuvântul"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Modificaţi"</string>
-    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Ştergeţi"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Ștergeţi"</string>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"Nu există cuvinte în dicţionarul utilizatorului. Puteţi adăuga un cuvânt atingând butonul Adăugaţi (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Pentru toate limbile"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Mai multe limbi..."</string>
@@ -1240,7 +1248,7 @@
     <string name="quick_launch_assign_application" msgid="6240064079456617501">"Atribuiţi o aplicaţie"</string>
     <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Fără comandă rapidă"</string>
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"Căutaţi + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
-    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Ştergeţi"</string>
+    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Ștergeţi"</string>
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Comanda dvs. rapidă pentru <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) va fi ştearsă."</string>
     <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
     <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Anulaţi"</string>
@@ -1479,7 +1487,7 @@
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalaţi de pe cardul SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalaţi certificate de pe stocare"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalaţi certificate de pe cardul SD"</string>
-    <string name="credentials_reset" msgid="3239382277144980418">"Ştergeţi acreditările"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Ștergeţi acreditările"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminaţi toate certificatele"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Acreditări de încredere"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Afişaţi certificatele CA de încredere"</string>
@@ -1545,7 +1553,7 @@
     <string name="wifi_setup_back" msgid="144777383739164044">"Înapoi"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalii reţea"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"Conect."</string>
-    <string name="wifi_setup_forget" msgid="2562847595567347526">"Ştergeţi"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Ștergeţi"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"Salvaţi"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Anulaţi"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Se scanează reţelele..."</string>
@@ -1610,7 +1618,7 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresă MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Introduceţi parola pentru a decripta stocarea"</string>
     <string name="try_again" msgid="4272075051293936921">"Încercaţi din nou."</string>
-    <string name="delete" msgid="4219243412325163003">"Ştergeţi"</string>
+    <string name="delete" msgid="4219243412325163003">"Ștergeţi"</string>
     <string name="misc_files" msgid="6720680815969643497">"Fişiere diverse"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"au fost selectate <xliff:g id="NUMBER">%1$d</xliff:g> din <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -1763,7 +1771,7 @@
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Adăugaţi un profil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Editaţi profilul"</string>
-    <string name="vpn_menu_delete" msgid="8098021690546891414">"Ştergeţi profilul"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Ștergeţi profilul"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Reţea VPN activată permanent"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selectaţi un profil VPN pentru a rămâne conectat întotdeauna la reţea. Traficul de reţea va fi permis numai atunci când sunteţi conectat(ă) la această reţea VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Niciuna"</string>
@@ -1807,7 +1815,7 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nu acum"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Numai proprietarul tabletei poate gestiona utilizatorii."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Numai proprietarul telefonului poate gestiona utilizatorii."</string>
-    <string name="user_remove_user_menu" msgid="6897150520686691355">"Ştergeţi <xliff:g id="USER_NAME">%1$s</xliff:g> de pe gadget"</string>
+    <string name="user_remove_user_menu" msgid="6897150520686691355">"Ștergeţi <xliff:g id="USER_NAME">%1$s</xliff:g> de pe gadget"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Utilizator nou"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vă eliminaţi ca utilizator?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Eliminaţi utilizatorul?"</string>
@@ -1816,8 +1824,8 @@
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Spaţiul şi datele acestui utilizator vor dispărea de pe tabletă. Nu puteţi anula această acţiune."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Spaţiul şi datele acestui utilizator vor dispărea de pe telefon. Nu puteţi anula această acţiune."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Se adaugă un utilizator nou…"</string>
-    <string name="user_delete_user_description" msgid="3158592592118767056">"Ştergeţi utilizatorul"</string>
-    <string name="user_delete_button" msgid="5131259553799403201">"Ştergeţi"</string>
+    <string name="user_delete_user_description" msgid="3158592592118767056">"Ștergeţi utilizatorul"</string>
+    <string name="user_delete_button" msgid="5131259553799403201">"Ștergeţi"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Această setare afectează toţi utilizatorii de pe această tabletă."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Această setare afectează toţi utilizatorii de pe acest telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Schimbaţi limba"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 644b302..0504727 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Крупный"</item>
     <item msgid="7786168277516233536">"Огромный"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Очень медленная"</item>
+    <item msgid="2361722960903353554">"Медленная"</item>
+    <item msgid="1145554631248513562">"Обычная"</item>
+    <item msgid="7553665153391107454">"Быстрая"</item>
+    <item msgid="1370673569131070146">"Беглая"</item>
+    <item msgid="4648206845228970803">"Достаточно быстрая"</item>
+    <item msgid="4977949754169483251">"Быстрая"</item>
+    <item msgid="6106302964845503577">"Ещё быстрее"</item>
+    <item msgid="6800277205640837264">"Очень быстрая"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Очень низкий"</item>
     <item msgid="2692137425242433765">"Низкий"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Не указано"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Внутренняя память устройства"</item>
     <item msgid="3738430123799803530">"Съемная SD-карта"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 49e20d2..57a10ed 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Сообщать при обнаружении открытой сети"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Фильтр сетей Wi-Fi"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Не использовать сети Wi-Fi с плохим интернет-соединением"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi в спящем режиме"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Не удалось изменить этот параметр"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Оптимизация Wi-Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN вкл."</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN выкл."</string>
     <string name="bearer" msgid="594270280031923558">"Владелец"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Удалить APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Новая точка доступа"</string>
     <string name="menu_save" msgid="8109345640668285399">"Сохранить"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 0e92f88..e23c6ad 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Veľké"</item>
     <item msgid="7786168277516233536">"Veľmi veľké"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Veľmi pomalá"</item>
+    <item msgid="2361722960903353554">"Pomalá"</item>
+    <item msgid="1145554631248513562">"Normálna"</item>
+    <item msgid="7553665153391107454">"Rýchla"</item>
+    <item msgid="1370673569131070146">"Rýchlejšia"</item>
+    <item msgid="4648206845228970803">"Veľmi rýchla"</item>
+    <item msgid="4977949754169483251">"Svižná"</item>
+    <item msgid="6106302964845503577">"Veľmi svižná"</item>
+    <item msgid="6800277205640837264">"Najrýchlejšia"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Veľmi nízka"</item>
     <item msgid="2692137425242433765">"Nízka"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Neurčené"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interný ukladací priestor zariadenia"</item>
     <item msgid="3738430123799803530">"Odnímateľná karta SD"</item>
@@ -346,8 +356,8 @@
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"Vypnuté"</item>
-    <item msgid="675719912558941285">"Vykresliť neobdĺžnikovú oblasť klipu modrou"</item>
-    <item msgid="1064373276095698656">"Zvýrazniť testované príkazy vykresľovania zelenou"</item>
+    <item msgid="675719912558941285">"Neobdĺžniková oblasť klipu modrou"</item>
+    <item msgid="1064373276095698656">"Test. príkazy vykresľovania zelenou"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Vypnuté"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index c1a2731..4e56ccd 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Oznamovať dostupné nezabezpečené siete"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vyhnúť sa nekvalitným pripojeniam"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Nepoužívať sieť Wi-Fi, pokiaľ nemá dostatočne kvalitné internetové pripojenie"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Ponechať pripojenie Wi-Fi zapnuté v režime spánku"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pri zmene nastavení sa vyskytol problém"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimalizácia Wi-Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Názov prístupového bodu (APN) je povolený"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Názov prístupového bodu (APN) je zakázaný"</string>
     <string name="bearer" msgid="594270280031923558">"Operátor"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Odstrániť názov prístupového bodu (APN)"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nový názov prístupového bodu (APN)"</string>
     <string name="menu_save" msgid="8109345640668285399">"Uložiť"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index a02ab6b..655d226 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Velika"</item>
     <item msgid="7786168277516233536">"Zelo velika"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Zelo počasna"</item>
+    <item msgid="2361722960903353554">"Počasna"</item>
+    <item msgid="1145554631248513562">"Običajna"</item>
+    <item msgid="7553665153391107454">"Hitra"</item>
+    <item msgid="1370673569131070146">"Hitreje"</item>
+    <item msgid="4648206845228970803">"Zelo hitro"</item>
+    <item msgid="4977949754169483251">"Naglo"</item>
+    <item msgid="6106302964845503577">"Zelo naglo"</item>
+    <item msgid="6800277205640837264">"Najhitreje"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Zelo nizek"</item>
     <item msgid="2692137425242433765">"Nizka"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Neopredeljeno"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Notranji pomnilnik naprave"</item>
     <item msgid="3738430123799803530">"Izmenljiva kartica SD"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 985a823..7c21255 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Obvesti me, ko bo na voljo odprto omrežje"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izogni se slabim povezavam"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Omrežje Wi-Fi uporabi samo, če je na voljo dobra internetna povezava"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Ohrani povezavo Wi-Fi med spanjem"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Težava pri spreminjanju nastavitve"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimizacija Wi-Fi-ja"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN omogočen"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN onemogočen"</string>
     <string name="bearer" msgid="594270280031923558">"Nosilec"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Izbriši APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nov APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Shrani"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index a9feebe..4bbeb43 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Велика"</item>
     <item msgid="7786168277516233536">"Огромна"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Веома споро"</item>
+    <item msgid="2361722960903353554">"Полако"</item>
+    <item msgid="1145554631248513562">"Нормалан"</item>
+    <item msgid="7553665153391107454">"Брзо"</item>
+    <item msgid="1370673569131070146">"Брже"</item>
+    <item msgid="4648206845228970803">"Веома брзо"</item>
+    <item msgid="4977949754169483251">"Брзо"</item>
+    <item msgid="6106302964845503577">"Веома брзо"</item>
+    <item msgid="6800277205640837264">"Најбрже"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Веома ниско"</item>
     <item msgid="2692137425242433765">"Низак"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Није наведено"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Складиште унутрашњег уређаја"</item>
     <item msgid="3738430123799803530">"Уклоњива SD картица"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 648008d..e83d5be 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Обавести ме када је отворена мрежа доступна"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Избегавај лоше везе"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Не користи Wi-Fi мрежу ако нема добру интернет везу"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Не искључуј Wi-Fi током стања спавања"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Дошло је до проблема приликом промене подешавања"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi оптимизација"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Назив приступне тачке је омогућен"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Назив приступне тачке је онемогућен"</string>
     <string name="bearer" msgid="594270280031923558">"Носилац"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Избриши назив приступне тачке"</string>
     <string name="menu_new" msgid="3014205883303921729">"Нов назив приступне тачке"</string>
     <string name="menu_save" msgid="8109345640668285399">"Сачувај"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 06526ba..99743f3 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Stor"</item>
     <item msgid="7786168277516233536">"Mycket stor"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Mycket långsam"</item>
+    <item msgid="2361722960903353554">"Långsam"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Snabb"</item>
+    <item msgid="1370673569131070146">"Snabbare"</item>
+    <item msgid="4648206845228970803">"Mycket snabbt"</item>
+    <item msgid="4977949754169483251">"Supersnabbt"</item>
+    <item msgid="6106302964845503577">"Turbosnabbt"</item>
+    <item msgid="6800277205640837264">"Snabbast"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Mycket låg"</item>
     <item msgid="2692137425242433765">"Låg"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Ej angiven"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Lagring på intern enhet"</item>
     <item msgid="3738430123799803530">"Flyttbart SD-kort"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c228a2a..43a1061 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Meddela mig när ett öppet nätverk är tillgängligt"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Undvik dåliga anslutningar"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Använd inte Wi-Fi-nätverk som inte har en bra internetanslutning"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Behåll Wi-Fi i viloläge"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ett problem inträffade när inställningen ändrades"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi-optimering"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN aktiverat"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN inaktiverat"</string>
     <string name="bearer" msgid="594270280031923558">"Bearer"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Ta bort APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nytt APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Spara"</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 8f71dee..efa4f21 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Kubwa"</item>
     <item msgid="7786168277516233536">"Kubwa sana"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Polepole sana"</item>
+    <item msgid="2361722960903353554">"Polepole"</item>
+    <item msgid="1145554631248513562">"Kawaida"</item>
+    <item msgid="7553665153391107454">"Haraka"</item>
+    <item msgid="1370673569131070146">"Kwa kasi"</item>
+    <item msgid="4648206845228970803">"Kasi sana"</item>
+    <item msgid="4977949754169483251">"Haraka"</item>
+    <item msgid="6106302964845503577">"Haraka sana"</item>
+    <item msgid="6800277205640837264">"Haraka mno"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Chini sana"</item>
     <item msgid="2692137425242433765">"Chini"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"(haijabainishwa)"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Kifaa cha hifadhi ya ndani"</item>
     <item msgid="3738430123799803530">"Kadi ya SD inayoondolewa"</item>
@@ -345,9 +355,9 @@
     <item msgid="1340692776955662664">"Simu imekwama kwenye glGetError"</item>
   </string-array>
   <string-array name="show_non_rect_clip_entries">
-    <item msgid="993742912147090253">"Zimezimwa"</item>
-    <item msgid="675719912558941285">"Chora eneo la klipu lisilo mstatili katika bluu"</item>
-    <item msgid="1064373276095698656">"Angazia amri za michoro iliyojaribiwa katika kijani"</item>
+    <item msgid="993742912147090253">"Imezimwa"</item>
+    <item msgid="675719912558941285">"Chora eneo la klipu lisilo mstatili kwa rangi ya bluu"</item>
+    <item msgid="1064373276095698656">"Angazia amri za michoro iliyojaribiwa kwa rangi ya kijani"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Imezimwa"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d4217aa..d14de57 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -532,6 +532,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Nijulishe wakati kuna mtandao huru"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Epuka miunganisho mibovu"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Usitumie mtandao wa Wi-Fi isipokuwa kama una muunganisho mzuri wa Intaneti"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Acha Wi-Fi  ikiwa imewashwa wakati wa kulala"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kulikuwa na hitilafu wakati wa kubadilisha mipangilio"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Uboreshaji wa Wi-Fi"</string>
@@ -871,6 +875,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN imewezeshwa"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN imelemazwa"</string>
     <string name="bearer" msgid="594270280031923558">"Mwenye"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Futa APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN Mpya"</string>
     <string name="menu_save" msgid="8109345640668285399">"Hifadhi"</string>
@@ -1645,7 +1653,7 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Lazimisha matumizi ya GPU kwa uchoraji wa 2d"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Lazimisha 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Wezesha 4x MSAA katika programu za OpenGL ES 2.0"</string>
-    <string name="show_non_rect_clip" msgid="505954950474595172">"Tatua waendeshaji wa klipu wasio mstatili"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Tatua uendeshaji wa klipu usio mstatili"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Utungilizaji wa GPU ya wasifu"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Kipimo cha uhiani wa Window"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Mageuzi ya kipimo cha huiani"</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 7cf2a60..19c5889 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"ใหญ่"</item>
     <item msgid="7786168277516233536">"ใหญ่มาก"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"ช้ามาก"</item>
+    <item msgid="2361722960903353554">"ช้า"</item>
+    <item msgid="1145554631248513562">"ปกติ"</item>
+    <item msgid="7553665153391107454">"เร็ว"</item>
+    <item msgid="1370673569131070146">"เร็วขึ้น"</item>
+    <item msgid="4648206845228970803">"เร็วมาก"</item>
+    <item msgid="4977949754169483251">"เร็ว"</item>
+    <item msgid="6106302964845503577">"เร็วมาก"</item>
+    <item msgid="6800277205640837264">"เร็วที่สุด"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"ต่ำมาก"</item>
     <item msgid="2692137425242433765">"ต่ำ"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"ไม่ระบุ"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"ที่จัดเก็บข้อมูลอุปกรณ์ภายใน"</item>
     <item msgid="3738430123799803530">"การ์ด SD แบบนำออกได้"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 34dac4e..b6f14ee 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"แจ้งฉันเมื่อมีเครือข่ายเปิดให้ใช้งานได้"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"หลีกเลี่ยงการเชื่อมต่อที่สัญญาณไม่แรงพอ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"อย่าใช้เครือข่าย WiFi หากไม่มีการเชื่อมต่ออินเทอร์เน็ตที่ดีเพียงพอ"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"เปิด WiFi ระหว่างที่อยู่ในโหมดสลีป"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"มีปัญหาในการเปลี่ยนแปลงการตั้งค่า"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"การเพิ่มประสิทธิภาพ WiFi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"เปิดใช้งาน APN แล้ว"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"ปิดใช้งาน APN แล้ว"</string>
     <string name="bearer" msgid="594270280031923558">"ผู้ถือ"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"ลบ APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN ใหม่"</string>
     <string name="menu_save" msgid="8109345640668285399">"บันทึก"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 6254541..9006444 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Malaki"</item>
     <item msgid="7786168277516233536">"Napakalaki"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Napakabagal"</item>
+    <item msgid="2361722960903353554">"Mabagal"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Mabilis"</item>
+    <item msgid="1370673569131070146">"Mas Mabilis"</item>
+    <item msgid="4648206845228970803">"Napakabilis"</item>
+    <item msgid="4977949754169483251">"Matulin"</item>
+    <item msgid="6106302964845503577">"Napakatulin"</item>
+    <item msgid="6800277205640837264">"Pinakamabilis"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Napakababa"</item>
     <item msgid="2692137425242433765">"Mababa"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Hindi tinukoy"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Imbakan ng panloob na device"</item>
     <item msgid="3738430123799803530">"Naaalis na SD card"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index a6e7b18..e891eba 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"I-notify ako kapag available ang bukas na network"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Iwasan ang mahihinang koneksyon"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Huwag gumamit ng Wi-Fi network maliban kung mayroon itong mahusay na koneksyon sa Internet"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Panatilihing naka-on ang Wi-Fi habang naka-sleep"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Nagkaproblema sa pagbabago ng setting"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Pag-optimize ng Wi-Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Pinagana ang APN"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Hindi pinagana ang APN"</string>
     <string name="bearer" msgid="594270280031923558">"Maydala"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Tanggalin ang APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Bagong APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"I-save"</string>
@@ -1317,7 +1325,7 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pag-magnify ng screen"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"I-auto update pag-magnify ng screen"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"I-update pag-magnify ng screen sa app transition"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tinatapos ng power button ang tawag"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tntpos ng pwer buttn ang twag"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Sabihin ang mga password"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Pindutin nang matagal ang pagkaantala"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Mga Setting"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 4534dea..fd3fd09 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Büyük"</item>
     <item msgid="7786168277516233536">"Çok Büyük"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Çok yavaş"</item>
+    <item msgid="2361722960903353554">"Yavaş"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
+    <item msgid="7553665153391107454">"Hızlı"</item>
+    <item msgid="1370673569131070146">"Daha hızlı"</item>
+    <item msgid="4648206845228970803">"Çok hızlı"</item>
+    <item msgid="4977949754169483251">"Seri"</item>
+    <item msgid="6106302964845503577">"Çok seri"</item>
+    <item msgid="6800277205640837264">"En hızlı"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Çok düşük"</item>
     <item msgid="2692137425242433765">"Düşük"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Belirtilmedi"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Dahili cihaz depolaması"</item>
     <item msgid="3738430123799803530">"Çıkarılabilir SD kart"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cba4f57..213d032 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Açık bir ağ kullanılabilir olduğunda bana bildir"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Kötü bağlantılardan kaçın"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"İnternet bağlantısı iyi olmadıkça Kablosuz ağı kullanma"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Uykudayken Kablosuz\'u açık tut"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ayarı değiştirirken bir sorun oluştu"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Kablosuz optimizasyonu"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN etkin"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN devre dışı"</string>
     <string name="bearer" msgid="594270280031923558">"Taşıyıcı"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"APN\'yi sil"</string>
     <string name="menu_new" msgid="3014205883303921729">"Yeni APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Kaydet"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 643e14d..86ed51b 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Великий"</item>
     <item msgid="7786168277516233536">"Дуже великий"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Дуже повільний"</item>
+    <item msgid="2361722960903353554">"Повільний"</item>
+    <item msgid="1145554631248513562">"Звичайний"</item>
+    <item msgid="7553665153391107454">"Швидкий"</item>
+    <item msgid="1370673569131070146">"Швидша"</item>
+    <item msgid="4648206845228970803">"Дуже швидка"</item>
+    <item msgid="4977949754169483251">"Висока"</item>
+    <item msgid="6106302964845503577">"Дуже висока"</item>
+    <item msgid="6800277205640837264">"Найшвидша"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Дуже низька"</item>
     <item msgid="2692137425242433765">"Низька"</item>
@@ -212,6 +218,12 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Не вказано"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Немає"</item>
+    <item msgid="6062567900587138000">"SPN"</item>
+    <item msgid="2454085083342423481">"IMSI"</item>
+    <item msgid="2681427309183221543">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Внутрішня пам\'ять пристрою"</item>
     <item msgid="3738430123799803530">"Знімна карта SD"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d8b66f2..28b699c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -540,6 +540,8 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Сповіщати мене про доступність відкритої мережі"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Уникати слабких з’єднань"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Не використовувати мережу Wi-Fi, якщо немає стійкого з’єднання з Інтернетом"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Сканування завжди доступне"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Дозволити службі локації Google та інших програмам сканувати мережі, навіть якщо Wi-Fi вимкнено."</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Не від’єднуватися від Wi‑Fi у режимі сну"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Виникла проблема зі зміною налаштувань"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Оптимізація Wi‑Fi"</string>
@@ -879,6 +881,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN увімкнено"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN вимкнено"</string>
     <string name="bearer" msgid="594270280031923558">"Власник"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Тип MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Значення MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Видалити APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Нова APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Зберег."</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 96fbcb7..a511b64 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Lớn"</item>
     <item msgid="7786168277516233536">"Rất lớn"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Rất chậm"</item>
+    <item msgid="2361722960903353554">"Chậm"</item>
+    <item msgid="1145554631248513562">"Thường"</item>
+    <item msgid="7553665153391107454">"Nhanh"</item>
+    <item msgid="1370673569131070146">"Nhanh hơn"</item>
+    <item msgid="4648206845228970803">"Rất nhanh"</item>
+    <item msgid="4977949754169483251">"Nhanh"</item>
+    <item msgid="6106302964845503577">"Rất nhanh"</item>
+    <item msgid="6800277205640837264">"Nhanh nhất"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Rất thấp"</item>
     <item msgid="2692137425242433765">"Thấp"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Không xác định"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Bộ nhớ trong của thiết bị"</item>
     <item msgid="3738430123799803530">"Thẻ SD tháo lắp được"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index cc349db..f9379a8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Thông báo cho tôi khi mạng mở khả dụng"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Tránh kết nối kém"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Không sử dụng mạng Wi‑Fi trừ khi mạng này có kết nối Internet tốt"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Giữ kết nối Wi-Fi khi ở chế độ ngủ"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Đã xảy ra sự cố khi thay đổi cài đặt"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Tối ưu hóa Wi‑Fi"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Đã bật APN"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Đã tắt APN"</string>
     <string name="bearer" msgid="594270280031923558">"Trình chuyển"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Xóa APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN mới"</string>
     <string name="menu_save" msgid="8109345640668285399">"Lưu"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 7da7c9b..b007791 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"大"</item>
     <item msgid="7786168277516233536">"超大"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"很慢"</item>
+    <item msgid="2361722960903353554">"慢"</item>
+    <item msgid="1145554631248513562">"正常"</item>
+    <item msgid="7553665153391107454">"快"</item>
+    <item msgid="1370673569131070146">"较快"</item>
+    <item msgid="4648206845228970803">"非常快"</item>
+    <item msgid="4977949754169483251">"迅速"</item>
+    <item msgid="6106302964845503577">"很迅速"</item>
+    <item msgid="6800277205640837264">"最快"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"很低"</item>
     <item msgid="2692137425242433765">"低"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"未指定"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"设备内存"</item>
     <item msgid="3738430123799803530">"可卸载的 SD 卡"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 52db5ec..c3afdbe 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -228,7 +228,7 @@
     <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"切换 DNS 检查"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"特定 OEM 的信息/设置"</string>
     <string name="band_mode_title" msgid="954174198903776205">"设置 GSM/UMTS 波段"</string>
-    <string name="band_mode_loading" msgid="548764766363847336">"正在载入波段列表..."</string>
+    <string name="band_mode_loading" msgid="548764766363847336">"正在加载波段列表..."</string>
     <string name="band_mode_set" msgid="5730560180249458484">"设置"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"失败"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"成功"</string>
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"附近有开放网络时通知我"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"避开状况不佳的网络"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"仅在 Wi-Fi 互联网连接状况良好时使用 Wi-Fi 网络"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"在休眠状态下保持 Wi-Fi 网络连接"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"更改设置时出现问题"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi 优化"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN 已启用"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN 已停用"</string>
     <string name="bearer" msgid="594270280031923558">"承载系统"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"删除 APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"新建 APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"保存"</string>
@@ -979,12 +987,12 @@
     <string name="license_title" msgid="1990487604356037871">"许可"</string>
     <string name="terms_title" msgid="7697580845616764642">"条款"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"开放源代码许可"</string>
-    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"载入许可时出现问题。"</string>
-    <string name="settings_license_activity_loading" msgid="3337535809093591740">"正在载入..."</string>
+    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"加载许可时出现问题。"</string>
+    <string name="settings_license_activity_loading" msgid="3337535809093591740">"正在加载..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"安全信息"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全信息"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="232523852222964470">"您没有数据连接。要立即查看此信息,请通过已联网的任意计算机访问 %s。"</string>
-    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"正在载入..."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"正在加载..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"选择您的密码"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"选择您的图案"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"选择您的 PIN"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 9e7dac7..4cf46d5 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"大"</item>
     <item msgid="7786168277516233536">"最大"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"非常慢"</item>
+    <item msgid="2361722960903353554">"慢"</item>
+    <item msgid="1145554631248513562">"適中"</item>
+    <item msgid="7553665153391107454">"快"</item>
+    <item msgid="1370673569131070146">"較快"</item>
+    <item msgid="4648206845228970803">"非常快"</item>
+    <item msgid="4977949754169483251">"快"</item>
+    <item msgid="6106302964845503577">"很快"</item>
+    <item msgid="6800277205640837264">"最快"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"非常低"</item>
     <item msgid="2692137425242433765">"低"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"未指定"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"內部裝置儲存空間"</item>
     <item msgid="3738430123799803530">"卸除式 SD 卡"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4a7d8b0..a2a6754 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"有開放網路時通知我"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"避開品質不佳的連線"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"除非 Wi-Fi 網路連線狀態良好,否則不使用"</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"休眠狀態仍保持 Wi-Fi 連線"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"變更設定時發生問題"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi 最佳化"</string>
@@ -879,6 +883,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN 已啟用"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN 已停用"</string>
     <string name="bearer" msgid="594270280031923558">"承載系統"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"刪除 APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"新增 APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"儲存"</string>
@@ -1627,7 +1635,7 @@
     <string name="select_application" msgid="5156029161289091703">"選取應用程式"</string>
     <string name="no_application" msgid="2813387563129153880">"無"</string>
     <string name="wait_for_debugger" msgid="1202370874528893091">"等待偵錯程式"</string>
-    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"先等待偵錯程式附加至偵錯程序,再對要接受偵錯的應用程式開始執行"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"執行受偵錯的應用程式之前,先等待偵錯程序附加完成"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"輸入"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"繪圖"</string>
     <string name="debug_hw_drawing_category" msgid="6220174216912308658">"硬體加速轉譯"</string>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 1c1f455..dff599f 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -65,11 +65,17 @@
     <item msgid="38373998008112077">"Okukhulu"</item>
     <item msgid="7786168277516233536">"Nkulu kakhulu"</item>
   </string-array>
-    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
-    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
-    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
-    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
-    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Phansi kakhulu"</item>
+    <item msgid="2361722960903353554">"Phansi"</item>
+    <item msgid="1145554631248513562">"Jwayelekile"</item>
+    <item msgid="7553665153391107454">"Sheshayo"</item>
+    <item msgid="1370673569131070146">"Ngokushesha"</item>
+    <item msgid="4648206845228970803">"Kushesha kakhulu"</item>
+    <item msgid="4977949754169483251">"Esheshisayo"</item>
+    <item msgid="6106302964845503577">"Esheshisa kakhulu"</item>
+    <item msgid="6800277205640837264">"Esheshisa kakhulukhulu"</item>
+  </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Phansi kakhulu"</item>
     <item msgid="2692137425242433765">"Phansi"</item>
@@ -212,6 +218,10 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"(okungacacisiwe)"</item>
   </string-array>
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Isitoreji sedivaysi yangaphakathi"</item>
     <item msgid="3738430123799803530">"Khipha ikhadi le-SD"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d3b5e63..f513934 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -540,6 +540,10 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Ngazise lapho inethiwekhi evulekile itholakala"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Gwema uxhumo olubi"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Ungasebenzisi inethiwekhi ye-Wi-Fi ngaphandle kokuthi inoxhumano lwe-intanethi olukahle."</string>
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Gcina i-Wi-Fi isebenza ngesikhathi sokulala"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kube khona inkinga yokushintsha ilungiselelo"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Ukuthuthukiswa kwe-Wi-Fi"</string>
@@ -880,6 +884,10 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"I-APN ivunyeliwe"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"I-APN ayisebenzi"</string>
     <string name="bearer" msgid="594270280031923558">"Umthwali"</string>
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Susa i-APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"I-APN Entsha"</string>
     <string name="menu_save" msgid="8109345640668285399">"Londoloza"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 00b07ec..1a11ebb 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -547,6 +547,29 @@
         <item>0</item>
     </string-array>
 
+    <!-- MVNO Info used in APN editor -->
+    <string-array name="mvno_type_entries">
+        <!-- Do not translate. -->
+        <item>None</item>
+        <!-- Do not translate. -->
+        <item>SPN</item>
+        <!-- Do not translate. -->
+        <item>IMSI</item>
+        <!-- Do not translate. -->
+        <item>GID</item>
+    </string-array>
+
+    <string-array translatable="false" name="mvno_type_values">
+        <!-- Do not translate. -->
+        <item></item>
+        <!-- Do not translate. -->
+        <item>spn</item>
+        <!-- Do not translate. -->
+        <item>imsi</item>
+        <!-- Do not translate. -->
+        <item>gid</item>
+    </string-array>
+
     <!-- Apps on SD instalaltion location options in ApplicationSettings -->
     <string-array name="app_install_location_entries">
         <item>Internal device storage</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 921b9e5..43259af 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1433,6 +1433,9 @@
     <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
     <string name="wifi_security_eap">802.1x EAP</string>
 
+    <string name="wifi_scan_always_turnon_message">To improve location accuracy and for other purposes, <xliff:g id="app_name">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?</string>
+    <string name="wifi_scan_always_confirm_allow">Allow</string>
+    <string name="wifi_scan_always_confirm_deny">Deny</string>
 
     <!-- Button label to connect to a Wi-Fi network -->
     <string name="wifi_connect">Connect</string>
@@ -2121,6 +2124,10 @@
     <string name="carrier_enabled_summaryOff">APN disabled</string>
     <!-- Edit Beaerer Info of APN -->
     <string name="bearer">Bearer</string>
+    <!-- Edit Mvno Type Info of APN -->
+    <string name="mvno_type">MVNO type</string>
+    <!-- Edit Mvno Match Data Info of APN -->
+    <string name="mvno_match_data">MVNO value</string>
     <!-- Edit access point screen menu option to delete this APN -->
     <string name="menu_delete">Delete APN</string>
     <!-- APNs screen menu option to create a brand spanking new APN -->
@@ -4269,12 +4276,25 @@
     <string name="user_list_title">Other users</string>
     <!-- User settings add user menu [CHAR LIMIT=20] -->
     <string name="user_add_user_menu">Add user</string>
+    <!-- User settings add restricted user label [CHAR LIMIT=20] -->
+    <string name="user_add_restricted">Add limited user</string>
+    <!-- User settings summary for add restricted user [CHAR LIMIT=100] -->
+    <string name="user_add_restricted_summary">Limited users can only access the apps and content you select</string>
+    <!-- User settings add user label [CHAR LIMIT=20] -->
+    <string name="user_add_trusted">Add trusted user</string>
+    <!-- User settings summary for add trusted user [CHAR LIMIT=100] -->
+    <string name="user_add_trusted_summary">Trusted users have no restrictions</string>
+
     <!-- User summary to indicate that user is currently active in the background [CHAR LIMIT=100] -->
     <string name="user_summary_active">Active</string>
     <!-- User summary to indicate that user is currently inactive in the background [CHAR LIMIT=100] -->
     <string name="user_summary_inactive">Not active</string>
     <!-- User summary to indicate that user is currently not set up [CHAR LIMIT=100] -->
     <string name="user_summary_not_set_up">Not set up</string>
+    <!-- Summary text for a trusted user [CHAR LIMIT=50] -->
+    <string name="user_trusted">Trusted</string>
+    <!-- Summary text for a limited user [CHAR LIMIT=50] -->
+    <string name="user_limited">Limited</string>
     <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
     <string name="user_owner">Owner</string>
     <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
@@ -4321,6 +4341,13 @@
     <!-- Delete button text [CHAR LIMIT=25] -->
     <string name="user_delete_button">Delete</string>
 
+    <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
+    <string name="application_restrictions">Allow apps and content</string>
+    <!-- Applications with restrictions header [CHAR LIMIT=45] -->
+    <string name="apps_with_restrictions_header">Applications with restrictions</string>
+    <!-- Applicaitons with restrictions - settings button [CHAR LIMIT=30] -->
+    <string name="apps_with_restrictions_settings_button">Expand settings for application</string>
+
     <!-- Warning message when changing a global setting for a tablet.[CHAR LIMIT=none] -->
     <string name="global_change_warning" product="tablet">This setting affects all users on this tablet.</string>
     <!-- Warning message when changing a global setting for a phone.[CHAR LIMIT=none] -->
@@ -4376,4 +4403,16 @@
     <string name="cell_broadcast_settings">Cell broadcasts</string>
     <!-- Cell Broadcast settings description [CHAR LIMIT=100] -->
     <string name="cell_broadcast_settings_summary">Select the types of emergency alerts to display.</string>
+
+    <!-- User app limits screen title [CHAR LIMIT=35] -->
+    <string name="user_restrictions_title">Allow apps and content</string>
+    <!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
+    <string name="user_rename">RENAME</string>
+
+    <!-- Wizard back button label [CHAR LIMIT=25] -->
+    <string name="wizard_back">Back</string>
+    <!-- Wizard next button label [CHAR LIMIT=25] -->
+    <string name="wizard_next">Next</string>
+    <!-- Wizard next button label [CHAR LIMIT=25] -->
+    <string name="wizard_finish">Finish</string>
 </resources>
diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
index 604a349..745a83e 100644
--- a/res/xml/apn_editor.xml
+++ b/res/xml/apn_editor.xml
@@ -141,4 +141,17 @@
         android:entries="@array/bearer_entries"
         android:entryValues="@array/bearer_values"
         />
+    <ListPreference
+        android:title="@string/mvno_type"
+        android:key="mvno_type"
+        android:entries="@array/mvno_type_entries"
+        android:entryValues="@array/mvno_type_values"
+        />
+    <EditTextPreference
+        android:title="@string/mvno_match_data"
+        android:dialogTitle="@string/mvno_match_data"
+        android:key="mvno_match_data"
+        android:singleLine="true"
+        android:inputType="text"
+        />
 </PreferenceScreen>   
diff --git a/res/xml/app_restrictions.xml b/res/xml/app_restrictions.xml
new file mode 100644
index 0000000..df02907
--- /dev/null
+++ b/res/xml/app_restrictions.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/application_restrictions"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+
+    <EditTextPreference
+            android:key="user_info"
+            android:order="0"
+            android:widgetLayout="@layout/preference_rename_widget" />
+
+</PreferenceScreen>
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index d97f1a6..3e61bd7 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -39,4 +39,15 @@
             android:title="@string/user_list_title">
     </PreferenceCategory>
 
+    <Preference
+            android:key="user_add_restricted"
+            android:title="@string/user_add_restricted"
+            android:summary="@string/user_add_restricted_summary"
+            android:icon="@drawable/ic_menu_add" />
+
+    <Preference
+            android:key="user_add_trusted"
+            android:title="@string/user_add_trusted"
+            android:summary="@string/user_add_trusted_summary"
+            android:icon="@drawable/ic_menu_add" />
 </PreferenceScreen>
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 79b6d15..f34abfa 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -57,6 +57,7 @@
     private final static String KEY_ROAMING_PROTOCOL = "apn_roaming_protocol";
     private final static String KEY_CARRIER_ENABLED = "carrier_enabled";
     private final static String KEY_BEARER = "bearer";
+    private final static String KEY_MVNO_TYPE = "mvno_type";
 
     private static final int MENU_DELETE = Menu.FIRST;
     private static final int MENU_SAVE = Menu.FIRST + 1;
@@ -82,6 +83,8 @@
     private ListPreference mRoamingProtocol;
     private CheckBoxPreference mCarrierEnabled;
     private ListPreference mBearer;
+    private ListPreference mMvnoType;
+    private EditTextPreference mMvnoMatchData;
 
     private String mCurMnc;
     private String mCurMcc;
@@ -115,7 +118,9 @@
             Telephony.Carriers.PROTOCOL, // 16
             Telephony.Carriers.CARRIER_ENABLED, // 17
             Telephony.Carriers.BEARER, // 18
-            Telephony.Carriers.ROAMING_PROTOCOL // 19
+            Telephony.Carriers.ROAMING_PROTOCOL, // 19
+            Telephony.Carriers.MVNO_TYPE,   // 20
+            Telephony.Carriers.MVNO_MATCH_DATA  // 21
     };
 
     private static final int ID_INDEX = 0;
@@ -137,6 +142,8 @@
     private static final int CARRIER_ENABLED_INDEX = 17;
     private static final int BEARER_INDEX = 18;
     private static final int ROAMING_PROTOCOL_INDEX = 19;
+    private static final int MVNO_TYPE_INDEX = 20;
+    private static final int MVNO_MATCH_DATA_INDEX = 21;
 
 
     @Override
@@ -174,6 +181,10 @@
         mBearer = (ListPreference) findPreference(KEY_BEARER);
         mBearer.setOnPreferenceChangeListener(this);
 
+        mMvnoType = (ListPreference) findPreference(KEY_MVNO_TYPE);
+        mMvnoType.setOnPreferenceChangeListener(this);
+        mMvnoMatchData = (EditTextPreference) findPreference("mvno_match_data");
+
         mRes = getResources();
 
         final Intent intent = getIntent();
@@ -274,6 +285,9 @@
             mRoamingProtocol.setValue(mCursor.getString(ROAMING_PROTOCOL_INDEX));
             mCarrierEnabled.setChecked(mCursor.getInt(CARRIER_ENABLED_INDEX)==1);
             mBearer.setValue(mCursor.getString(BEARER_INDEX));
+            mMvnoType.setValue(mCursor.getString(MVNO_TYPE_INDEX));
+            mMvnoMatchData.setEnabled(false);
+            mMvnoMatchData.setText(mCursor.getString(MVNO_MATCH_DATA_INDEX));
         }
 
         mName.setSummary(checkNull(mName.getText()));
@@ -307,6 +321,9 @@
                 checkNull(protocolDescription(mRoamingProtocol.getValue(), mRoamingProtocol)));
         mBearer.setSummary(
                 checkNull(bearerDescription(mBearer.getValue())));
+        mMvnoType.setSummary(
+                checkNull(mvnoDescription(mMvnoType.getValue())));
+        mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
     }
 
     /**
@@ -342,6 +359,27 @@
         }
     }
 
+    private String mvnoDescription(String raw) {
+        int mvnoIndex = mMvnoType.findIndexOfValue(raw);
+        if (mvnoIndex == -1) {
+            return null;
+        } else {
+            String[] values = mRes.getStringArray(R.array.mvno_type_entries);
+            if (values[mvnoIndex].equals("None")) {
+                mMvnoMatchData.setEnabled(false);
+                mMvnoMatchData.setText("");
+            } else {
+                mMvnoMatchData.setEnabled(true);
+            }
+
+            try {
+                return values[mvnoIndex];
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return null;
+            }
+        }
+    }
+
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
         if (KEY_AUTH_TYPE.equals(key)) {
@@ -375,6 +413,13 @@
             }
             mBearer.setValue((String) newValue);
             mBearer.setSummary(bearer);
+        } else if (KEY_MVNO_TYPE.equals(key)) {
+            String mvno = mvnoDescription((String) newValue);
+            if (mvno == null) {
+                return false;
+            }
+            mMvnoType.setValue((String) newValue);
+            mMvnoType.setSummary(mvno);
         }
 
         return true;
@@ -508,6 +553,9 @@
             values.put(Telephony.Carriers.BEARER, Integer.parseInt(bearerVal));
         }
 
+        values.put(Telephony.Carriers.MVNO_TYPE, checkNotSet(mMvnoType.getValue()));
+        values.put(Telephony.Carriers.MVNO_MATCH_DATA, checkNotSet(mMvnoMatchData.getText()));
+
         getContentResolver().update(mUri, values, null, null);
 
         return true;
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index cc3fe31..0c00c68 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -277,13 +277,19 @@
         mPolicyEditor = new NetworkPolicyEditor(mPolicyManager);
         mPolicyEditor.read();
 
+        try {
+            mStatsSession = mStatsService.openSession();
+        } catch (RemoteException e) {
+            throw new RuntimeException(e);
+        }
+
         mShowWifi = mPrefs.getBoolean(PREF_SHOW_WIFI, false);
         mShowEthernet = mPrefs.getBoolean(PREF_SHOW_ETHERNET, false);
 
         // override preferences when no mobile radio
         if (!hasReadyMobileRadio(context)) {
-            mShowWifi = hasWifiRadio(context);
-            mShowEthernet = hasEthernet(context);
+            mShowWifi = true;
+            mShowEthernet = true;
         }
 
         setHasOptionsMenu(true);
@@ -298,12 +304,6 @@
 
         mUidDetailProvider = new UidDetailProvider(context);
 
-        try {
-            mStatsSession = mStatsService.openSession();
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        }
-
         mTabHost = (TabHost) view.findViewById(android.R.id.tabhost);
         mTabsContainer = (ViewGroup) view.findViewById(R.id.tabs_container);
         mTabWidget = (TabWidget) view.findViewById(android.R.id.tabs);
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 962d042..be8e1cc 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -22,6 +22,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.RestrictionEntry;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
@@ -56,6 +57,7 @@
 import com.android.settings.accounts.ManageAccountsSettings;
 import com.android.settings.bluetooth.BluetoothEnabler;
 import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.users.RestrictionsReceiver;
 import com.android.settings.wfd.WifiDisplaySettings;
 import com.android.settings.wifi.WifiEnabler;
 import com.android.settings.wifi.WifiSettings;
@@ -133,12 +135,16 @@
     private Header mLastHeader;
     private boolean mListeningToAccountUpdates;
 
+    private List<RestrictionEntry> mAppRestrictions;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         if (getIntent().hasExtra(EXTRA_UI_OPTIONS)) {
             getWindow().setUiOptions(getIntent().getIntExtra(EXTRA_UI_OPTIONS, 0));
         }
 
+        mAppRestrictions = getApplicationRestrictions();
+
         mAuthenticatorHelper = new AuthenticatorHelper();
         mAuthenticatorHelper.updateAuthDescriptions(this);
         mAuthenticatorHelper.onAccountsUpdated(this, null);
@@ -408,7 +414,6 @@
                 DevelopmentSettings.PREF_SHOW,
                 android.os.Build.TYPE.equals("eng"));
         int i = 0;
-
         mHeaderIndexMap.clear();
         while (i < target.size()) {
             Header header = target.get(i);
@@ -450,6 +455,15 @@
                 if (!showDev) {
                     target.remove(i);
                 }
+            } else if (id == R.id.application_settings) {
+                if (mAppRestrictions != null) {
+                    for (RestrictionEntry entry : mAppRestrictions) {
+                        if (entry.key.equals(RestrictionsReceiver.KEY_ENABLE_APPS)
+                                && !entry.getBooleanValue()) {
+                            target.remove(i);
+                        }
+                    }
+                }
             }
 
             if (i < target.size() && target.get(i) == header
@@ -828,4 +842,5 @@
     public static class WifiDisplaySettingsActivity extends Settings { /* empty */ }
     public static class DreamSettingsActivity extends Settings { /* empty */ }
     public static class NotificationStationActivity extends Settings { /* empty */ }
+    public static class UserSettingsActivity extends Settings { /* empty */ }
 }
diff --git a/src/com/android/settings/deviceinfo/UsbSettings.java b/src/com/android/settings/deviceinfo/UsbSettings.java
index b8290fc..a836fb3 100644
--- a/src/com/android/settings/deviceinfo/UsbSettings.java
+++ b/src/com/android/settings/deviceinfo/UsbSettings.java
@@ -123,7 +123,6 @@
             mMtp.setEnabled(false);
             mPtp.setEnabled(false);
         }
-
     }
 
     @Override
@@ -134,22 +133,17 @@
         if (Utils.isMonkeyRunning()) {
             return true;
         }
-        // temporary hack - using check boxes as radio buttons
-        // don't allow unchecking them
-        if (preference instanceof CheckBoxPreference) {
-            CheckBoxPreference checkBox = (CheckBoxPreference)preference;
-            if (!checkBox.isChecked()) {
-                checkBox.setChecked(true);
-                return true;
-            }
+
+        String function = "none";
+        if (preference == mMtp && mMtp.isChecked()) {
+            function = UsbManager.USB_FUNCTION_MTP;
+        } else if (preference == mPtp && mPtp.isChecked()) {
+            function = UsbManager.USB_FUNCTION_PTP;
         }
-        if (preference == mMtp) {
-            mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP, true);
-            updateToggles(UsbManager.USB_FUNCTION_MTP);
-        } else if (preference == mPtp) {
-            mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP, true);
-            updateToggles(UsbManager.USB_FUNCTION_PTP);
-        }
+
+        mUsbManager.setCurrentFunction(function, true);
+        updateToggles(function);
+
         return true;
     }
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index a229888..5145789 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -557,77 +557,77 @@
                             lastX = x;
                             lastY = y;
                         }
+                    }
 
-                        final boolean charging =
-                            (rec.states&HistoryItem.STATE_BATTERY_PLUGGED_FLAG) != 0;
-                        if (charging != lastCharging) {
-                            if (charging) {
-                                mChargingPath.moveTo(x, h-mChargingOffset);
-                            } else {
-                                mChargingPath.lineTo(x, h-mChargingOffset);
-                            }
-                            lastCharging = charging;
+                    final boolean charging =
+                        (rec.states&HistoryItem.STATE_BATTERY_PLUGGED_FLAG) != 0;
+                    if (charging != lastCharging) {
+                        if (charging) {
+                            mChargingPath.moveTo(x, h-mChargingOffset);
+                        } else {
+                            mChargingPath.lineTo(x, h-mChargingOffset);
                         }
+                        lastCharging = charging;
+                    }
 
-                        final boolean screenOn =
-                            (rec.states&HistoryItem.STATE_SCREEN_ON_FLAG) != 0;
-                        if (screenOn != lastScreenOn) {
-                            if (screenOn) {
-                                mScreenOnPath.moveTo(x, h-mScreenOnOffset);
-                            } else {
-                                mScreenOnPath.lineTo(x, h-mScreenOnOffset);
-                            }
-                            lastScreenOn = screenOn;
+                    final boolean screenOn =
+                        (rec.states&HistoryItem.STATE_SCREEN_ON_FLAG) != 0;
+                    if (screenOn != lastScreenOn) {
+                        if (screenOn) {
+                            mScreenOnPath.moveTo(x, h-mScreenOnOffset);
+                        } else {
+                            mScreenOnPath.lineTo(x, h-mScreenOnOffset);
                         }
+                        lastScreenOn = screenOn;
+                    }
 
-                        final boolean gpsOn =
-                            (rec.states&HistoryItem.STATE_GPS_ON_FLAG) != 0;
-                        if (gpsOn != lastGpsOn) {
-                            if (gpsOn) {
-                                mGpsOnPath.moveTo(x, h-mGpsOnOffset);
-                            } else {
-                                mGpsOnPath.lineTo(x, h-mGpsOnOffset);
-                            }
-                            lastGpsOn = gpsOn;
+                    final boolean gpsOn =
+                        (rec.states&HistoryItem.STATE_GPS_ON_FLAG) != 0;
+                    if (gpsOn != lastGpsOn) {
+                        if (gpsOn) {
+                            mGpsOnPath.moveTo(x, h-mGpsOnOffset);
+                        } else {
+                            mGpsOnPath.lineTo(x, h-mGpsOnOffset);
                         }
+                        lastGpsOn = gpsOn;
+                    }
 
-                        final boolean wifiRunning =
-                            (rec.states&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
-                        if (wifiRunning != lastWifiRunning) {
-                            if (wifiRunning) {
-                                mWifiRunningPath.moveTo(x, h-mWifiRunningOffset);
-                            } else {
-                                mWifiRunningPath.lineTo(x, h-mWifiRunningOffset);
-                            }
-                            lastWifiRunning = wifiRunning;
+                    final boolean wifiRunning =
+                        (rec.states&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
+                    if (wifiRunning != lastWifiRunning) {
+                        if (wifiRunning) {
+                            mWifiRunningPath.moveTo(x, h-mWifiRunningOffset);
+                        } else {
+                            mWifiRunningPath.lineTo(x, h-mWifiRunningOffset);
                         }
+                        lastWifiRunning = wifiRunning;
+                    }
 
-                        final boolean wakeLock =
-                            (rec.states&HistoryItem.STATE_WAKE_LOCK_FLAG) != 0;
-                        if (wakeLock != lastWakeLock) {
-                            if (wakeLock) {
-                                mWakeLockPath.moveTo(x, h-mWakeLockOffset);
-                            } else {
-                                mWakeLockPath.lineTo(x, h-mWakeLockOffset);
-                            }
-                            lastWakeLock = wakeLock;
+                    final boolean wakeLock =
+                        (rec.states&HistoryItem.STATE_WAKE_LOCK_FLAG) != 0;
+                    if (wakeLock != lastWakeLock) {
+                        if (wakeLock) {
+                            mWakeLockPath.moveTo(x, h-mWakeLockOffset);
+                        } else {
+                            mWakeLockPath.lineTo(x, h-mWakeLockOffset);
                         }
+                        lastWakeLock = wakeLock;
+                    }
 
-                        if (mLargeMode && mHavePhoneSignal) {
-                            int bin;
-                            if (((rec.states&HistoryItem.STATE_PHONE_STATE_MASK)
-                                    >> HistoryItem.STATE_PHONE_STATE_SHIFT)
-                                    == ServiceState.STATE_POWER_OFF) {
-                                bin = 0;
-                            } else if ((rec.states&HistoryItem.STATE_PHONE_SCANNING_FLAG) != 0) {
-                                bin = 1;
-                            } else {
-                                bin = (rec.states&HistoryItem.STATE_SIGNAL_STRENGTH_MASK)
-                                        >> HistoryItem.STATE_SIGNAL_STRENGTH_SHIFT;
-                                bin += 2;
-                            }
-                            mPhoneSignalChart.addTick(x, bin);
+                    if (mLargeMode && mHavePhoneSignal) {
+                        int bin;
+                        if (((rec.states&HistoryItem.STATE_PHONE_STATE_MASK)
+                                >> HistoryItem.STATE_PHONE_STATE_SHIFT)
+                                == ServiceState.STATE_POWER_OFF) {
+                            bin = 0;
+                        } else if ((rec.states&HistoryItem.STATE_PHONE_SCANNING_FLAG) != 0) {
+                            bin = 1;
+                        } else {
+                            bin = (rec.states&HistoryItem.STATE_SIGNAL_STRENGTH_MASK)
+                                    >> HistoryItem.STATE_SIGNAL_STRENGTH_SHIFT;
+                            bin += 2;
                         }
+                        mPhoneSignalChart.addTick(x, bin);
                     }
 
                 } else if (rec.cmd != BatteryStats.HistoryItem.CMD_OVERFLOW) {
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
new file mode 100644
index 0000000..9757f30
--- /dev/null
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -0,0 +1,463 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.users;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.RestrictionEntry;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
+import android.preference.ListPreference;
+import android.preference.MultiSelectListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceGroup;
+import android.preference.SwitchPreference;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.Switch;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import libcore.util.CollectionUtils;
+
+public class AppRestrictionsFragment extends SettingsPreferenceFragment implements
+        OnPreferenceChangeListener, OnClickListener, OnPreferenceClickListener {
+
+    private static final String TAG = AppRestrictionsFragment.class.getSimpleName();
+
+    private static final String PKG_PREFIX = "pkg_";
+    private static final String KEY_USER_INFO = "user_info";
+
+    private UserManager mUserManager;
+    private UserHandle mUser;
+
+    private EditTextPreference mUserPreference;
+    private PreferenceGroup mAppList;
+
+    private static final int MAX_APP_RESTRICTIONS = 100;
+
+    private static final String DELIMITER = ";";
+    private List<ResolveInfo> mApps;
+    HashMap<String,Boolean> mSelectedPackages = new HashMap<String,Boolean>();
+    private boolean mFirstTime = true;
+    private boolean mNewUser;
+
+    public static class Activity extends PreferenceActivity {
+        @Override
+        public Intent getIntent() {
+            Intent modIntent = new Intent(super.getIntent());
+            modIntent.putExtra(EXTRA_SHOW_FRAGMENT, AppRestrictionsFragment.class.getName());
+            modIntent.putExtra(EXTRA_NO_HEADERS, true);
+            return modIntent;
+        }
+    }
+
+    static class AppRestrictionsPreference extends SwitchPreference {
+        private boolean hasSettings;
+        private OnClickListener listener;
+        private ArrayList<RestrictionEntry> restrictions;
+        boolean panelOpen;
+        private boolean required;
+        List<Preference> childPreferences = new ArrayList<Preference>();
+
+        AppRestrictionsPreference(Context context, OnClickListener listener) {
+            super(context);
+            setLayoutResource(R.layout.preference_app_restrictions);
+            this.listener = listener;
+        }
+
+        private void setSettingsEnabled(boolean enable) {
+            hasSettings = enable;
+        }
+
+        void setRestrictions(ArrayList<RestrictionEntry> restrictions) {
+            this.restrictions = restrictions;
+        }
+
+        void setRequired(boolean required) {
+            this.required = required;
+        }
+
+        boolean isRequired() {
+            return required;
+        }
+
+        RestrictionEntry getRestriction(String key) {
+            if (restrictions == null) return null;
+            for (RestrictionEntry entry : restrictions) {
+                if (entry.key.equals(key)) {
+                    return entry;
+                }
+            }
+            return null;
+        }
+
+        ArrayList<RestrictionEntry> getRestrictions() {
+            return restrictions;
+        }
+
+        @Override
+        protected void onBindView(View view) {
+            super.onBindView(view);
+
+            View appRestrictionsSettings = view.findViewById(R.id.app_restrictions_settings);
+            appRestrictionsSettings.setVisibility(hasSettings ? View.VISIBLE : View.GONE);
+            view.findViewById(R.id.settings_divider).setVisibility(
+                    hasSettings ? View.VISIBLE : View.GONE);
+            appRestrictionsSettings.setOnClickListener(listener);
+            appRestrictionsSettings.setTag(this);
+
+            View appRestrictionsPref = view.findViewById(R.id.app_restrictions_pref);
+            appRestrictionsPref.setOnClickListener(listener);
+            appRestrictionsPref.setTag(this);
+
+            ViewGroup widget = (ViewGroup) view.findViewById(android.R.id.widget_frame);
+            widget.setEnabled(!isRequired());
+            if (widget.getChildCount() > 0) {
+                final Switch switchView = (Switch) widget.getChildAt(0);
+                switchView.setEnabled(!isRequired());
+                switchView.setTag(this);
+                switchView.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+                    @Override
+                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                        listener.onClick(switchView);
+                    }
+                });
+            }
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        addPreferencesFromResource(R.xml.app_restrictions);
+        mAppList = getPreferenceScreen();
+        mUserPreference = (EditTextPreference) findPreference(KEY_USER_INFO);
+        mUserPreference.setOnPreferenceChangeListener(this);
+        setHasOptionsMenu(true);
+    }
+
+    void setUser(UserHandle user, boolean newUser) {
+        mUser = user;
+        mNewUser = newUser;
+    }
+
+    public void onResume() {
+        super.onResume();
+        if (mFirstTime) {
+            mFirstTime = false;
+            populateApps();
+        }
+        UserInfo info = mUserManager.getUserInfo(mUser.getIdentifier());
+        mUserPreference.setTitle(info.name);
+        mUserPreference.setIcon(
+                new BitmapDrawable(mUserManager.getUserIcon(mUser.getIdentifier())));
+        mUserPreference.setText(info.name);
+    }
+
+    private void populateApps() {
+        mAppList.setOrderingAsAdded(false);
+
+        // TODO: Do this asynchronously since it can be a long operation
+        final Context context = getActivity();
+        PackageManager pm = context.getPackageManager();
+        Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
+        launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+        mApps = pm.queryIntentActivities(launcherIntent, 0);
+        Collections.sort(mApps, new AppLabelComparator(pm));
+
+        Intent restrictionsIntent = new Intent(Intent.ACTION_GET_RESTRICTION_ENTRIES);
+        final List<ResolveInfo> receivers = pm.queryBroadcastReceivers(restrictionsIntent, 0);
+        final List<ResolveInfo> existingApps = pm.queryIntentActivitiesAsUser(launcherIntent,
+                0, mUser.getIdentifier());
+        int i = 0;
+        if (receivers != null && receivers.size() > 0) {
+            for (ResolveInfo app : mApps) {
+                if (app.activityInfo == null || app.activityInfo.packageName == null) continue;
+                String packageName = app.activityInfo.packageName;
+                Drawable icon = app.loadIcon(pm);
+                CharSequence label = app.loadLabel(pm);
+                AppRestrictionsPreference p = new AppRestrictionsPreference(context, this);
+                p.setIcon(icon);
+                p.setTitle(label);
+                p.setKey(PKG_PREFIX + packageName);
+                p.setSettingsEnabled(hasPackage(receivers, packageName));
+                p.setPersistent(false);
+                p.setOnPreferenceChangeListener(this);
+                p.setOnPreferenceClickListener(this);
+                try {
+                    PackageInfo pi = pm.getPackageInfo(packageName, 0);
+                    if (pi.requiredForAllUsers) {
+                        p.setChecked(true);
+                        p.setRequired(true);
+                    } else if (!mNewUser && hasPackage(existingApps, packageName)) {
+                        p.setChecked(true);
+                    }
+                } catch (NameNotFoundException re) {
+                    // This would be bad
+                }
+
+                mAppList.addPreference(p);
+                if (packageName.equals(getActivity().getPackageName())) {
+                    p.setOrder(MAX_APP_RESTRICTIONS * 1);
+                } else {
+                    p.setOrder(MAX_APP_RESTRICTIONS * (i + 2));
+                }
+                mSelectedPackages.put(packageName, p.isChecked());
+                i++;
+            }
+        }
+    }
+
+    private class AppLabelComparator implements Comparator<ResolveInfo> {
+
+        PackageManager pm;
+
+        private AppLabelComparator(PackageManager pm) {
+            this.pm = pm;
+        }
+
+        private CharSequence getLabel(ResolveInfo info) {
+            // TODO: Optimize this with a cache
+            return info.activityInfo.loadLabel(pm);
+        }
+
+        @Override
+        public int compare(ResolveInfo lhs, ResolveInfo rhs) {
+            String lhsLabel = getLabel(lhs).toString();
+            String rhsLabel = getLabel(rhs).toString();
+            return lhsLabel.compareTo(rhsLabel);
+        }
+    }
+
+    private boolean hasPackage(List<ResolveInfo> receivers, String packageName) {
+        for (ResolveInfo info : receivers) {
+            if (info.activityInfo.packageName.equals(packageName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getTag() instanceof AppRestrictionsPreference) {
+            AppRestrictionsPreference pref = (AppRestrictionsPreference) v.getTag();
+            if (v.getId() == R.id.app_restrictions_settings) {
+                handleSettingsClick(pref);
+            } else if (!pref.isRequired()) {
+                pref.setChecked(!pref.isChecked());
+                mSelectedPackages.put(pref.getKey().substring(PKG_PREFIX.length()),
+                        pref.isChecked());
+            }
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        String key = preference.getKey();
+        if (key != null && key.contains(DELIMITER)) {
+            StringTokenizer st = new StringTokenizer(key, DELIMITER);
+            final String packageName = st.nextToken();
+            final String restrictionKey = st.nextToken();
+            AppRestrictionsPreference appPref = (AppRestrictionsPreference)
+                    mAppList.findPreference(PKG_PREFIX+packageName);
+            ArrayList<RestrictionEntry> restrictions = appPref.getRestrictions();
+            if (restrictions != null) {
+                for (RestrictionEntry entry : restrictions) {
+                    if (entry.key.equals(restrictionKey)) {
+                        switch (entry.type) {
+                        case RestrictionEntry.TYPE_BOOLEAN:
+                            entry.setValue((Boolean) newValue);
+                            break;
+                        case RestrictionEntry.TYPE_CHOICE:
+                        case RestrictionEntry.TYPE_CHOICE_LEVEL:
+                            ListPreference listPref = (ListPreference) preference;
+                            entry.setValue((String) newValue);
+                            for (int i = 0; i < listPref.getEntryValues().length; i++) {
+                                if (entry.values[i].equals(newValue)) {
+                                    listPref.setSummary(entry.choices[i]);
+                                    break;
+                                }
+                            }
+                            break;
+                        case RestrictionEntry.TYPE_MULTI_SELECT:
+                            MultiSelectListPreference msListPref =
+                                    (MultiSelectListPreference) preference;
+                            Set<String> set = (Set<String>) newValue;
+                            String [] selectedValues = new String[set.size()];
+                            set.toArray(selectedValues);
+                            entry.setMultipleValues(selectedValues);
+                            break;
+                        default:
+                            continue;
+                        }
+                        mUserManager.setApplicationRestrictions(packageName, restrictions,
+                                mUser);
+                        break;
+                    }
+                }
+            }
+        } else if (preference == mUserPreference) {
+            String userName = ((CharSequence) newValue).toString();
+            if (!TextUtils.isEmpty(userName)) {
+                mUserManager.setUserName(mUser.getIdentifier(), userName);
+                mUserPreference.setTitle(userName);
+            }
+        }
+        return true;
+    }
+
+    private void handleSettingsClick(AppRestrictionsPreference preference) {
+        if (preference.getKey().startsWith(PKG_PREFIX)) {
+            if (preference.panelOpen) {
+                for (Preference p : preference.childPreferences) {
+                    mAppList.removePreference(p);
+                }
+                preference.childPreferences.clear();
+            } else {
+                String packageName = preference.getKey().substring(PKG_PREFIX.length());
+                List<RestrictionEntry> oldEntries =
+                        mUserManager.getApplicationRestrictions(packageName, mUser);
+                Intent intent = new Intent(Intent.ACTION_GET_RESTRICTION_ENTRIES);
+                intent.putParcelableArrayListExtra(Intent.EXTRA_RESTRICTIONS,
+                        new ArrayList<RestrictionEntry>(oldEntries));
+                getActivity().sendOrderedBroadcast(intent, null,
+                        new RestrictionsResultReceiver(packageName, preference),
+                        null, Activity.RESULT_OK, null, null);
+            }
+            preference.panelOpen = !preference.panelOpen;
+        }
+    }
+
+    class RestrictionsResultReceiver extends BroadcastReceiver {
+
+        String packageName;
+        AppRestrictionsPreference preference;
+
+        RestrictionsResultReceiver(String packageName, AppRestrictionsPreference preference) {
+            super();
+            this.packageName = packageName;
+            this.preference = preference;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            ArrayList<RestrictionEntry> restrictions = getResultExtras(true).getParcelableArrayList(
+                    Intent.EXTRA_RESTRICTIONS);
+            if (restrictions != null) {
+                int count = 1;
+                for (RestrictionEntry entry : restrictions) {
+                    Preference p = null;
+                    switch (entry.type) {
+                    case RestrictionEntry.TYPE_BOOLEAN:
+                        p = new CheckBoxPreference(context);
+                        p.setTitle(entry.title);
+                        p.setSummary(entry.description);
+                        ((CheckBoxPreference)p).setChecked(entry.getBooleanValue());
+                        break;
+                    case RestrictionEntry.TYPE_CHOICE:
+                    case RestrictionEntry.TYPE_CHOICE_LEVEL:
+                        p = new ListPreference(context);
+                        p.setTitle(entry.title);
+                        String value = entry.getStringValue();
+                        if (value == null) {
+                            value = entry.description;
+                        }
+                        p.setSummary(value);
+                        ((ListPreference)p).setEntryValues(entry.values);
+                        ((ListPreference)p).setEntries(entry.choices);
+                        ((ListPreference)p).setValue(entry.getStringValue());
+                        break;
+                    case RestrictionEntry.TYPE_MULTI_SELECT:
+                        p = new MultiSelectListPreference(context);
+                        p.setTitle(entry.title);
+                        ((MultiSelectListPreference)p).setEntryValues(entry.values);
+                        ((MultiSelectListPreference)p).setEntries(entry.choices);
+                        HashSet<String> set = new HashSet<String>();
+                        for (String s : entry.getMultipleValues()) {
+                            set.add(s);
+                        }
+                        ((MultiSelectListPreference)p).setValues(set);
+                        break;
+                    case RestrictionEntry.TYPE_NULL:
+                    default:
+                    }
+                    if (p != null) {
+                        p.setPersistent(false);
+                        p.setOrder(preference.getOrder() + count);
+                        // Store the restrictions key string as a key for the preference
+                        p.setKey(preference.getKey().substring(PKG_PREFIX.length()) + DELIMITER
+                                + entry.key);
+                        mAppList.addPreference(p);
+                        p.setOnPreferenceChangeListener(AppRestrictionsFragment.this);
+                        preference.childPreferences.add(p);
+                        count++;
+                    }
+                }
+                preference.setRestrictions(restrictions);
+            }
+            mUserManager.setApplicationRestrictions(packageName, restrictions, mUser);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        if (preference.getKey().startsWith(PKG_PREFIX)) {
+            AppRestrictionsPreference arp = (AppRestrictionsPreference) preference;
+            if (!arp.isRequired()) {
+                arp.setChecked(!arp.isChecked());
+                mSelectedPackages.put(arp.getKey().substring(PKG_PREFIX.length()), arp.isChecked());
+            }
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/users/RestrictionsReceiver.java b/src/com/android/settings/users/RestrictionsReceiver.java
new file mode 100644
index 0000000..0eeb7cd
--- /dev/null
+++ b/src/com/android/settings/users/RestrictionsReceiver.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.users;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.RestrictionEntry;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.settings.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Test class, to demonstrate the features. TODO: Remove or modify with real restrictions */
+public class RestrictionsReceiver extends BroadcastReceiver {
+
+    private static final String TAG = RestrictionsReceiver.class.getSimpleName();
+
+    public static final String KEY_VERSION = "version";
+    public static final String KEY_ENABLE_APPS = "enable_apps";
+    public static final String KEY_SECTIONS_TO_SHOW = "enable_sections";
+    public static final String KEY_CONTENT_RATING = "content_rating";
+
+    private static final int[] SECTION_IDS = {
+        R.id.wifi_settings,
+        R.id.bluetooth_settings,
+        R.id.data_usage_settings,
+        R.id.app_settings,
+        R.id.date_time_settings,
+        R.id.about_settings
+    };
+
+    private static final int[] SECTION_TITLE_IDS = {
+        R.string.wifi_settings,
+        R.string.bluetooth_settings,
+        R.string.data_usage_summary_title,
+        R.string.manageapplications_settings_title,
+        R.string.date_and_time,
+        R.string.about_settings
+    };
+
+    @Override
+    public void onReceive(final Context context, Intent intent) {
+        final PendingResult result = goAsync();
+        final ArrayList<RestrictionEntry> oldRestrictions =
+                intent.getParcelableArrayListExtra(Intent.EXTRA_RESTRICTIONS);
+        Log.i(TAG, "oldRestrictions = " + oldRestrictions);
+        new Thread() {
+            public void run() {
+                createRestrictions(context, result, oldRestrictions);
+            }
+        }.start();
+    }
+
+    private void createRestrictions(Context context,
+            PendingResult result, List<RestrictionEntry> old) {
+        ArrayList<RestrictionEntry> newRestrictions = new ArrayList<RestrictionEntry>();
+        boolean oldEnableApps = false;
+        String oldContentRating = "";
+        String[] oldEnabledSections = new String[0];
+        if (old != null) {
+            for (RestrictionEntry r : old) {
+                if (r.key.equals(KEY_ENABLE_APPS)) {
+                    oldEnableApps = r.getBooleanValue();
+                } else if (r.key.equals(KEY_CONTENT_RATING)) {
+                    oldContentRating = r.getStringValue();
+                } else if (r.key.equals(KEY_SECTIONS_TO_SHOW)) {
+                    oldEnabledSections = r.getMultipleValues();
+                }
+            }
+        }
+
+        RestrictionEntry r0 = new RestrictionEntry(KEY_VERSION, "1");
+        newRestrictions.add(r0);
+
+        RestrictionEntry r1 = new RestrictionEntry(KEY_ENABLE_APPS,
+                Boolean.toString(oldEnableApps));
+        r1.title = "Enable apps";
+        r1.description = "Show the Apps section in Settings";
+        r1.type = RestrictionEntry.TYPE_BOOLEAN;
+        newRestrictions.add(r1);
+
+        RestrictionEntry r2 = new RestrictionEntry(KEY_CONTENT_RATING, oldContentRating);
+        r2.title = "Test: Content rating";
+        r2.description = "Limit content to chosen rating and lower";
+        r2.type = RestrictionEntry.TYPE_CHOICE_LEVEL;
+        r2.values = new String[] { "G", "PG", "PG13", "R", "NR" };
+        r2.choices = new String[] { "G", "PG", "PG-13", "Restricted", "Not Rated" };
+        newRestrictions.add(r2);
+
+        String [] values = new String[SECTION_IDS.length];
+        String [] choices = new String[SECTION_IDS.length];
+        int i = 0;
+        for (int sectionId : SECTION_IDS) {
+            values[i] = Integer.toString(sectionId);
+            choices[i] = context.getString(SECTION_TITLE_IDS[i]);
+            i++;
+        }
+        RestrictionEntry r3 = new RestrictionEntry(KEY_SECTIONS_TO_SHOW, oldEnabledSections);
+        r3.type = RestrictionEntry.TYPE_MULTI_SELECT;
+        r3.choices = choices;
+        r3.values = values;
+        r3.title = "Test: Sections to show";
+        newRestrictions.add(r3);
+
+        Bundle extras = new Bundle();
+        extras.putParcelableArrayList(Intent.EXTRA_RESTRICTIONS, newRestrictions);
+        result.setResult(0, null, extras);
+        result.finish();
+    }
+}
diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java
index 23cca73..6889747 100644
--- a/src/com/android/settings/users/UserPreference.java
+++ b/src/com/android/settings/users/UserPreference.java
@@ -20,6 +20,7 @@
 import com.android.settings.R;
 
 import android.content.Context;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
 import android.util.AttributeSet;
@@ -31,21 +32,32 @@
     public static final int USERID_UNKNOWN = -10;
 
     private OnClickListener mDeleteClickListener;
+    private OnClickListener mSettingsClickListener;
     private int mSerialNumber = -1;
     private int mUserId = USERID_UNKNOWN;
+    private boolean mRestricted;
+    static final int SETTINGS_ID = R.id.manage_user;
+    static final int DELETE_ID = R.id.trash_user;
 
     public UserPreference(Context context, AttributeSet attrs) {
-        this(context, attrs, USERID_UNKNOWN, false, null);
+        this(context, attrs, USERID_UNKNOWN, false, null, null);
     }
 
-    UserPreference(Context context, AttributeSet attrs, int userId, boolean showDelete,
-            OnClickListener deleteListener) {
+    UserPreference(Context context, AttributeSet attrs, int userId,
+            boolean showOptions, OnClickListener deleteListener,
+            OnClickListener settingsListener) {
         super(context, attrs);
-        if (showDelete) {
+        if (showOptions) {
             setWidgetLayoutResource(R.layout.preference_user_delete_widget);
             mDeleteClickListener = deleteListener;
+            mSettingsClickListener = settingsListener;
         }
         mUserId = userId;
+        if (mUserId > UserHandle.USER_OWNER) {
+            mRestricted = ((UserManager) getContext().getSystemService(Context.USER_SERVICE))
+                    .getUserInfo(mUserId).isRestricted();
+        }
+        setSummary(mRestricted ? R.string.user_limited : R.string.user_trusted);
     }
 
     @Override
@@ -55,6 +67,15 @@
             deleteView.setOnClickListener(mDeleteClickListener);
             deleteView.setTag(this);
         }
+        View settingsView = view.findViewById(R.id.manage_user);
+        if (settingsView != null) {
+            if (mRestricted) {
+                settingsView.setOnClickListener(mSettingsClickListener);
+                settingsView.setTag(this);
+            } else {
+                settingsView.setVisibility(View.INVISIBLE);
+            }
+        }
         super.onBindView(view);
     }
 
diff --git a/src/com/android/settings/users/UserRestrictionsActivity.java b/src/com/android/settings/users/UserRestrictionsActivity.java
new file mode 100644
index 0000000..5f377f3
--- /dev/null
+++ b/src/com/android/settings/users/UserRestrictionsActivity.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.users;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.IPackageManager;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+import com.android.settings.R;
+
+import java.util.Map;
+
+public class UserRestrictionsActivity extends Activity implements OnClickListener {
+
+    private static final String TAG = UserRestrictionsActivity.class.getSimpleName();
+
+    static final String EXTRA_USER_NAME = "user_name";
+    static final String EXTRA_USER_ID = "user_id";
+    static final String EXTRA_ACCOUNTS = "accounts";
+
+    private Button mFinishButton;
+    private Button mBackButton;
+    private AppRestrictionsFragment mAppsFragment;
+    private UserInfo mUserInfo;
+    private boolean mNewUser;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.user_limits);
+
+        mBackButton = (Button) findViewById(R.id.back_button);
+        if (mBackButton != null) {
+            mBackButton.setOnClickListener(this);
+        }
+        mFinishButton = (Button) findViewById(R.id.next_button);
+        if (mFinishButton != null) {
+            mFinishButton.setOnClickListener(this);
+        }
+        mAppsFragment = (AppRestrictionsFragment)
+                getFragmentManager().findFragmentById(R.id.user_limits_fragment);
+
+        UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
+        String name = getIntent().getStringExtra(EXTRA_USER_NAME);
+        int userId = getIntent().getIntExtra(EXTRA_USER_ID, -1);
+        // Create the user so we have an id
+        if (userId == -1) {
+            mNewUser = true;
+            mUserInfo = um.createUser(name, UserInfo.FLAG_RESTRICTED);
+            um.setUserRestriction(UserManager.ALLOW_MODIFY_ACCOUNTS, false,
+                    new UserHandle(mUserInfo.id));
+
+            Bitmap bitmap = BitmapFactory.decodeResource(getResources(),
+                    UserSettings.USER_DRAWABLES[
+                            mUserInfo.id % UserSettings.USER_DRAWABLES.length]);
+            um.setUserIcon(mUserInfo.id, bitmap);
+        } else {
+            mUserInfo = um.getUserInfo(userId);
+        }
+        if (mAppsFragment != null) {
+            mAppsFragment.setUser(new UserHandle(mUserInfo.id), mNewUser);
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v == mFinishButton) {
+            if (mNewUser) {
+                AccountManager am = AccountManager.get(this);
+                Account [] accounts = am.getAccounts();
+                if (accounts != null) {
+                    for (Account account : accounts) {
+                        am.addSharedAccount(account,
+                                new UserHandle(mUserInfo.id));
+                    }
+                }
+            }
+
+            IPackageManager ipm = IPackageManager.Stub.asInterface(
+                    ServiceManager.getService("package"));
+            for (Map.Entry<String,Boolean> entry : mAppsFragment.mSelectedPackages.entrySet()) {
+                if (entry.getValue()) {
+                    // Enable selected apps
+                    try {
+                        ipm.installExistingPackageAsUser(entry.getKey(), mUserInfo.id);
+                    } catch (RemoteException re) {
+                    }
+                } else {
+                    // Blacklist all other apps, system or downloaded
+                    try {
+                        ipm.deletePackageAsUser(entry.getKey(), null, mUserInfo.id,
+                                PackageManager.DELETE_SYSTEM_APP);
+                    } catch (RemoteException re) {
+                    }
+                }
+            }
+            setResult(RESULT_OK);
+            mUserInfo = null;
+            finish();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        if (mUserInfo != null && mNewUser) {
+            UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
+            um.removeUser(mUserInfo.id);
+        }
+    }
+}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index dbaaf37..b6385c8 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.users;
 
+import android.accounts.Account;
+import android.accounts.AccountManager;
 import android.app.ActivityManagerNative;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -76,6 +78,8 @@
     private static final String KEY_USER_NICKNAME = "user_nickname";
     private static final String KEY_USER_LIST = "user_list";
     private static final String KEY_USER_ME = "user_me";
+    private static final String KEY_ADD_RESTRICTED_USER = "user_add_restricted";
+    private static final String KEY_ADD_TRUSTED_USER = "user_add_trusted";
 
     private static final int MENU_ADD_USER = Menu.FIRST;
     private static final int MENU_REMOVE_USER = Menu.FIRST+1;
@@ -91,7 +95,7 @@
     private static final String KEY_ADD_USER_LONG_MESSAGE_DISPLAYED =
             "key_add_user_long_message_displayed";
 
-    private static final int[] USER_DRAWABLES = {
+    static final int[] USER_DRAWABLES = {
         R.drawable.avatar_default_1,
         R.drawable.avatar_default_2,
         R.drawable.avatar_default_3,
@@ -105,6 +109,8 @@
     private PreferenceGroup mUserListCategory;
     private Preference mMePreference;
     private SelectableEditTextPreference mNicknamePreference;
+    private Preference mAddRestrictedUser;
+    private Preference mAddTrustedUser;
     private int mRemovingUserId = -1;
     private int mAddedUserId = 0;
     private boolean mAddingUser;
@@ -176,6 +182,14 @@
                 InputType.TYPE_TEXT_VARIATION_NORMAL | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
         mNicknamePreference.setInitialSelectionMode(
                 SelectableEditTextPreference.SELECTION_SELECT_ALL);
+        mAddRestrictedUser = findPreference(KEY_ADD_RESTRICTED_USER);
+        mAddTrustedUser = findPreference(KEY_ADD_TRUSTED_USER);
+        mAddRestrictedUser.setOnPreferenceClickListener(this);
+        mAddTrustedUser.setOnPreferenceClickListener(this);
+        if (!mIsOwner || UserManager.getMaxSupportedUsers() < 2) {
+            removePreference(KEY_ADD_RESTRICTED_USER);
+            removePreference(KEY_ADD_TRUSTED_USER);
+        }
         loadProfile();
         setHasOptionsMenu(true);
         IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
@@ -207,13 +221,7 @@
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (mIsOwner) {
-            if (UserManager.getMaxSupportedUsers() > mUserManager.getUsers(false).size()) {
-                MenuItem addUserItem = menu.add(0, MENU_ADD_USER, 0, R.string.user_add_user_menu);
-                addUserItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
-                        | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-            }
-        } else {
+        if (!mIsOwner) {
             String nickname = mUserManager.getUserName();
             MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, 0,
                     getResources().getString(R.string.user_remove_user_menu, nickname));
@@ -284,6 +292,13 @@
         }
     }
 
+    private void onManageUserClicked(int userId) {
+        Intent appsChooser = new Intent();
+        appsChooser.setClass(getActivity(), UserRestrictionsActivity.class);
+        appsChooser.putExtra(UserRestrictionsActivity.EXTRA_USER_ID, userId);
+        startActivity(appsChooser);
+    }
+
     private void onUserCreated(int userId) {
         mAddedUserId = userId;
         showDialog(DIALOG_SETUP_USER);
@@ -438,7 +453,7 @@
                 mNicknamePreference.setSummary(user.name);
             } else {
                 pref = new UserPreference(getActivity(), null, user.id,
-                        UserHandle.myUserId() == UserHandle.USER_OWNER, this);
+                        UserHandle.myUserId() == UserHandle.USER_OWNER, this, this);
                 pref.setOnPreferenceClickListener(this);
                 pref.setKey("id=" + user.id);
                 mUserListCategory.addPreference(pref);
@@ -446,9 +461,9 @@
                     pref.setSummary(R.string.user_owner);
                 }
                 pref.setTitle(user.name);
-                if (!isInitialized(user)) {
-                    pref.setSummary(R.string.user_summary_not_set_up);
-                }
+//                if (!isInitialized(user)) {
+//                    pref.setSummary(R.string.user_summary_not_set_up);
+//                }
             }
             if (user.iconPath != null) {
                 if (mUserIcons.get(user.id) == null) {
@@ -462,10 +477,10 @@
         // Add a temporary entry for the user being created
         if (mAddingUser) {
             Preference pref = new UserPreference(getActivity(), null, UserPreference.USERID_UNKNOWN,
-                    false, null);
+                    false, null, null);
             pref.setEnabled(false);
             pref.setTitle(R.string.user_new_user_name);
-            pref.setSummary(R.string.user_adding_new_user);
+            //pref.setSummary(R.string.user_adding_new_user);
             pref.setIcon(R.drawable.avatar_default_1);
             mUserListCategory.addPreference(pref);
         }
@@ -557,6 +572,17 @@
                             MESSAGE_SETUP_USER, user.id, user.serialNumber));
                 }
             }
+        } else if (pref == mAddTrustedUser) {
+            onAddUserClicked();
+        } else if (pref == mAddRestrictedUser) {
+            Account[] accounts = ((AccountManager) getSystemService(Context.ACCOUNT_SERVICE))
+                    .getAccounts();
+            Intent intent = new Intent(getActivity(), UserRestrictionsActivity.class);
+            intent.putExtra(UserRestrictionsActivity.EXTRA_USER_NAME,
+                    getResources().getString(R.string.user_new_user_name));
+            intent.putExtra(UserRestrictionsActivity.EXTRA_ACCOUNTS,
+                    accounts);
+            startActivity(intent);
         }
         return false;
     }
@@ -569,7 +595,14 @@
     public void onClick(View v) {
         if (v.getTag() instanceof UserPreference) {
             int userId = ((UserPreference) v.getTag()).getUserId();
-            onRemoveUserClicked(userId);
+            switch (v.getId()) {
+            case UserPreference.DELETE_ID:
+                onRemoveUserClicked(userId);
+                break;
+            case UserPreference.SETTINGS_ID:
+                onManageUserClicked(userId);
+                break;
+            }
         }
     }
 
diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java
new file mode 100644
index 0000000..b83b22f
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiScanModeActivity.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import com.android.settings.R;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.util.Log;
+
+/**
+ * This activity requests users permission to allow scanning even when Wi-Fi is turned off
+ */
+public class WifiScanModeActivity extends Activity {
+    private DialogFragment mDialog;
+    private String mApp;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = getIntent();
+        if (savedInstanceState == null) {
+            if (intent != null && intent.getAction()
+                    .equals(WifiManager.ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE)) {
+                mApp = getCallingPackage();
+            } else {
+                finish();
+                return;
+            }
+        } else {
+            mApp = savedInstanceState.getString("app");
+        }
+        createDialog();
+    }
+
+    private void createDialog() {
+        if (mDialog == null) {
+            mDialog = AlertDialogFragment.newInstance(mApp);
+            mDialog.show(getFragmentManager(), "dialog");
+        }
+    }
+
+    private void dismissDialog() {
+        if (mDialog != null) {
+            mDialog.dismiss();
+            mDialog = null;
+        }
+    }
+
+    private void doPositiveClick() {
+        Settings.Global.putInt(getContentResolver(),
+                Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1);
+        setResult(RESULT_OK);
+        finish();
+    }
+
+    private void doNegativeClick() {
+        setResult(RESULT_CANCELED);
+        finish();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString("app", mApp);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        dismissDialog();
+    }
+
+    public void onResume() {
+        super.onResume();
+        createDialog();
+    }
+
+    public static class AlertDialogFragment extends DialogFragment {
+        static AlertDialogFragment newInstance(String app) {
+            AlertDialogFragment frag = new AlertDialogFragment(app);
+            return frag;
+        }
+
+        private final String mApp;
+        public AlertDialogFragment(String app) {
+            super();
+            mApp = app;
+        }
+
+        public AlertDialogFragment() {
+            super();
+            mApp = null;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            return new AlertDialog.Builder(getActivity())
+                    .setMessage(getString(R.string.wifi_scan_always_turnon_message, mApp))
+                    .setPositiveButton(R.string.wifi_scan_always_confirm_allow,
+                            new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int whichButton) {
+                                    ((WifiScanModeActivity) getActivity()).doPositiveClick();
+                                }
+                            }
+                    )
+                    .setNegativeButton(R.string.wifi_scan_always_confirm_deny,
+                            new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int whichButton) {
+                                    ((WifiScanModeActivity) getActivity()).doNegativeClick();
+                                }
+                            }
+                    )
+                    .create();
+        }
+        @Override
+        public void onCancel(DialogInterface dialog) {
+            ((WifiScanModeActivity) getActivity()).doNegativeClick();
+        }
+    }
+}
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index ee3d6e2..4b2a0c9 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -21,7 +21,6 @@
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -45,7 +44,6 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.security.Credentials;
 import android.telephony.TelephonyManager;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -114,6 +112,9 @@
     private static final String SAVE_DIALOG_EDIT_MODE = "edit_mode";
     private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
 
+    // Activity result when pressing the Skip button
+    private static final int RESULT_SKIP = Activity.RESULT_FIRST_USER;
+
     private final IntentFilter mFilter;
     private final BroadcastReceiver mReceiver;
     private final Scanner mScanner;
@@ -277,8 +278,10 @@
         mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
 
         mConnectListener = new WifiManager.ActionListener() {
+                                   @Override
                                    public void onSuccess() {
                                    }
+                                   @Override
                                    public void onFailure(int reason) {
                                        Activity activity = getActivity();
                                        if (activity != null) {
@@ -290,8 +293,10 @@
                                };
 
         mSaveListener = new WifiManager.ActionListener() {
+                                @Override
                                 public void onSuccess() {
                                 }
+                                @Override
                                 public void onFailure(int reason) {
                                     Activity activity = getActivity();
                                     if (activity != null) {
@@ -303,8 +308,10 @@
                             };
 
         mForgetListener = new WifiManager.ActionListener() {
+                                   @Override
                                    public void onSuccess() {
                                    }
+                                   @Override
                                    public void onFailure(int reason) {
                                        Activity activity = getActivity();
                                        if (activity != null) {
@@ -363,7 +370,7 @@
 
         if (mSetupWizardMode) {
             getView().setSystemUiVisibility(
-                    View.STATUS_BAR_DISABLE_BACK |
+//                    View.STATUS_BAR_DISABLE_BACK |
                     View.STATUS_BAR_DISABLE_HOME |
                     View.STATUS_BAR_DISABLE_RECENT |
                     View.STATUS_BAR_DISABLE_NOTIFICATION_ALERTS |
@@ -634,7 +641,7 @@
                                     new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int id) {
-                                    getActivity().setResult(Activity.RESULT_CANCELED);
+                                    getActivity().setResult(RESULT_SKIP);
                                     getActivity().finish();
                                 }
                             })
@@ -653,7 +660,7 @@
                                     new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int id) {
-                                    getActivity().setResult(Activity.RESULT_CANCELED);
+                                    getActivity().setResult(RESULT_SKIP);
                                     getActivity().finish();
                                 }
                             })
@@ -941,6 +948,7 @@
         }
     }
 
+    @Override
     public void onClick(DialogInterface dialogInterface, int button) {
         if (button == WifiDialog.BUTTON_FORGET && mSelectedAccessPoint != null) {
             forget();