Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev

commit: 58f9cbd6774741d7fffbddbd06f2c0bf1fdf2e66 [log] [tgz]
author: Robert Greenwalt <rgreenwalt@google.com> Tue Apr 02 19:20:12 2013 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Tue Apr 02 19:20:13 2013 +0000
tree: c0dbc50a6f32627a4273700916d25a7002b1358c
parent: 1c541aec2be937f3ba6b1530551c16435d0eafc6 [diff]
parent: cd1cb16bad2686990014430197cf7cdd56190c86 [diff]
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9579830..143a394 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml

@@ -29,6 +29,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIMAX_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIMAX_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="com.android.certinstaller.INSTALL_AS_USER" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
@@ -1601,11 +1602,5 @@
             </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/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index f966d20..03226ca 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml

@@ -46,6 +46,7 @@
     <TextView
         android:id="@android:id/text1"
         android:layout_marginStart="8dip"
+        android:layout_marginTop="2dip"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <ProgressBar

diff --git a/res/layout/preference_powergauge.xml b/res/layout/preference_powergauge.xml
deleted file mode 100644
index 5efc028..0000000
--- a/res/layout/preference_powergauge.xml
+++ /dev/null

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<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="16dip"
-    android:paddingEnd="?android:attr/scrollbarSize">
-
-    <ImageView
-        android:id="@+id/appIcon"
-        android:layout_width="48dip"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="6dip"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dip"
-        android:layout_marginTop="2dip"
-        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:layout_marginTop="2dip"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:layout_toStartOf="@+id/percent"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-        <TextView android:id="@+id/percent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignBottom="@android:id/title"
-            android:layout_gravity="bottom"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textStyle="bold"/>
-
-        <ImageView
-            android:id="@+id/appGauge"
-            android:background="#80404040"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:layout_marginTop="5dip"
-            android:layout_below="@id/percent"
-            android:layout_gravity="center_vertical"
-            android:contentDescription="@null" />
-
-        <TextView android:id="@+android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignStart="@id/appGauge"
-            android:layout_below="@id/appGauge"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:maxLines="2" />
-
-    </RelativeLayout>
-
-</LinearLayout>

diff --git a/res/layout/wifi_dialog_row.xml b/res/layout/wifi_dialog_row.xml
index 7ca2e5c..ff04a40 100644
--- a/res/layout/wifi_dialog_row.xml
+++ b/res/layout/wifi_dialog_row.xml

@@ -23,5 +23,6 @@
     <TextView
             android:id="@+id/value"
             style="@style/wifi_item_content"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:textAlignment="viewStart" />
 </LinearLayout>

diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index d06bd76..d688c58 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Geen"</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">"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 b2e341e..a3d98a9 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Skandering altyd beskikbaar"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Laat Google se liggingdiens en ander programme skandeer vir netwerke, selfs wanneer Wi-Fi af is"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Om akkuraatheid te verbeter en vir ander doeleindes, kan Google en ander programme dalk skandeer vir nabygeleë netwerke, selfs wanneer Wi-Fi af is. As jy nie wil hê dat dit gebeur nie, gaan na Gevorderd &gt; Skandering altyd beskikbaar."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Programme kan dalk skandeer vir nabygeleë netwerke, selfs wanneer Wi-Fi af is. As jy nie wil hê dat dit gebeur nie, gaan na Gevorderd &gt; Skandering altyd beskikbaar."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Moenie weer wys nie"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om liggingsakkuraatheid te verbeter en vir ander doele, wil <xliff:g id="APP_NAME">%1$s</xliff:g> netwerkskandering aanskakel, selfs wanneer Wi-Fi af is."\n\n" Laat dit toe vir alle programme wat wil skandeer?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Laat toe"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Weier"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koppel"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Netwerkverbinding het misluk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeet"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"MVNO-tipe"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-waarde"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Verwyder alle sertifikate"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertroude eiebewyse"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Wys vertroude CA-sertifikate"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teken jou ontsluitpatroon"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Jy moet jou ontsluitpatroon teken om eiebewysinstallasie te bevestig."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Pas toe"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Gebruikers"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Jy"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Ander gebruikers"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Voeg gebruiker by"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Voeg beperkte gebruiker by"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Beperkte gebruikers kan net toegang kry tot die programme en inhoud wat jy kies"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Voeg vertroude gebruiker by"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Vertroude gebruikers het geen beperkings nie"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktief"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Nieaktief"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nie opgestel nie"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Vertroude"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Beperk"</string>
     <string name="user_owner" msgid="3879126011135546571">"Eienaar"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Kennaam"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Voeg nuwe gebruiker by"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Voeg tans nuwe gebruiker by..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Vee gebruiker uit"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Vee uit"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Laat programme en inhoud toe"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programme met beperkings"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Brei instellings vir program uit"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Hierdie instelling beïnvloed alle gebruikers op hierdie tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Hierdie instelling beïnvloed alle gebruikers op hierdie foon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Verander taal"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Seluitsendings"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Kies die tipe noodwaarskuwings wat vertoon moet word."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Laat programme en inhoud toe"</string>
+    <string name="user_rename" msgid="8523499513614655279">"HERNOEM"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Terug"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Volgende"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Klaar"</string>
 </resources>

diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index d9675d0..443bad2 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml

@@ -218,10 +218,12 @@
     <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="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-am/strings.xml b/res/values-am/strings.xml
index 674f2a0..340eb1c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -166,7 +166,7 @@
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"የስልክ አድራሻ ጠይቅ"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s የአንተን ዕውቂያዎች እና የጥሪ ታሪኮች ለመድረስ ይፈልጋል ። ለ%2$s መድረስ ይሰጥ?"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"ዳግመኛ አትጠይቅ"</string>
-    <string name="date_and_time" msgid="4114084177056654663">"ቀን&amp; የሰዓትቅንብሮች"</string>
+    <string name="date_and_time" msgid="4114084177056654663">"ቀን&amp; የሰዓት ቅንብሮች"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"የጊዜ ሰቅ ምረጥ"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"የአካባቢው (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"ቅድመ-ዕይታ"</string>
@@ -540,9 +540,15 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"መቃኘት ሁልጊዜ ይገኛል"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"የGoogle የአካባቢ አገልግሎትን እና ሌሎች መተግበሪያዎች አውታረ መረቦችን ለማግኘት እንዲቃኙ ያድርጓቸው፣ Wi-Fi ጠፍቶም ቢሆን እንኳን"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <!-- no translation found for wifi_scan_notify_text_location_on (8135076005488914200) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_text_location_off (6323983741393280935) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_remember_choice (5340097010842405981) -->
     <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"በሚተኛበት Wi-Fi እንደበራ ይቆይ"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"ቅንብሮቹን ለመለወጥ ችግር ነበር።"</string>
@@ -605,6 +611,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"በ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> የተጠበቀ"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"፣ በ<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> የተጠበቀ"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"የለም"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> የአካባቢ ትክክለኛነትን ለማሻሻል እና ለሌሎች ዓላማዎች የአውታረ መረብ መቃኘትን ማብራት ይፈልጋል፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ።"\n\n"ይሄ ለሁሉም መቃኘት ለሚፈልጉ መተግበሪያዎች ይፈቀድ?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ፍቀድ"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ከልክል"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"አያይዝ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ከአውታረ መረቡ ጋር መገናኘት አልተሳካም"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"እርሳ"</string>
@@ -711,7 +720,7 @@
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"ስልኩን ከትከል ስታስገባ ወይም ስታስወግድ ዘፈን አታጫውት"</string>
     <string name="account_settings" msgid="6403589284618783461">"መለያዎች"</string>
     <string name="search_settings" msgid="1910951467596035063">"ፍለጋ"</string>
-    <string name="search_settings_summary" msgid="9205656546570654169">"የፍለጋ ታሪክእና ቅንብሮችንአደራጅ"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"የፍለጋ ታሪክ እና ቅንብሮችን ያደራጁ"</string>
     <string name="display_settings" msgid="7965901687241669598">"አሳይ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ማያ በራስ ሰር አሽከርክር"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ጡባዊ ሲሽከረከርየገፅ አቀማመጥ በራስሰርቀይር"</string>
@@ -883,10 +892,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>
-    <!-- no translation found for mvno_type (2543253857818336421) -->
-    <skip />
-    <!-- no translation found for mvno_match_data (4560671695220540466) -->
-    <skip />
+    <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>
@@ -896,7 +903,7 @@
     <string name="error_apn_empty" msgid="6056233831214537267">"APN ባዶ መሆን አይችልም።"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"የMCC መስክ 3 አሀዝ መሆን አለበት።"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"የMNC መስክ 2 ወይም 3 አሀዝ መሆን አለበት።"</string>
-    <string name="restore_default_apn" msgid="8178010218751639581">"ነባሪ የAPN ቅንጅቶችን እነበረበት መልስ"</string>
+    <string name="restore_default_apn" msgid="8178010218751639581">"ነባሪ የAPN ቅንብሮችን እነበረበት ይመልሱ"</string>
     <string name="menu_restore" msgid="8260067415075573273">"ወደ ነባሪ ዳግም አስጀምር"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"የዳግም አስጀምር ነባሪ APN ቅንብሮች ተጠናቀዋል"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"የፋብሪካ ውሂብ ዳግም አስጀምር"</string>
@@ -1045,7 +1052,7 @@
     <string name="verify_applications" msgid="2959359554974828518">"መተግበሪያዎችን ያረጋግጡ"</string>
     <string name="verify_applications_summary" msgid="6737505521913263792">"ሊጎዱ የሚችሉ መተግበሪያዎችን ከልክል ወይም ከመጫናቸው በፊት አስጠንቅቅ"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"የላቁ ቅንብሮች"</string>
-    <string name="advanced_settings_summary" msgid="4016682978071086747">"ተጨማሪ የቅንጅቶች አማራጮ ች አንቃ"</string>
+    <string name="advanced_settings_summary" msgid="4016682978071086747">"ተጨማሪ የቅንብሮች አማራጮች ያንቁ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"የመተግበሪያ መረጃ"</string>
     <string name="storage_label" msgid="8700867073480107253">"ማከማቻ"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"በነባሪ አስነሳ"</string>
@@ -1284,7 +1291,7 @@
     <string name="adb_warning_title" msgid="6234463310896563253">"የUSB ማረሚያ ይፈቀድ?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"የUSB አድስ ለግንባታ አላማ ብቻ የታሰበ ነው። ከኮምፒዩተርህ ወደ መሳሪያህ ውሂብ ለመገልበጥ፣ መሣሪያህ ላይ ያለ ማሳወቂያ መተግበሪያዎችን መጫን፣ እና ማስታወሻ ውሂብ ማንበብ ለመጠቀም ይቻላል።"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"የዩ ኤስ ቢ ማረም መዳረሻ ከዚህ ቀደም ፍቃድ ከሰጧቸው ኮምፒውተሮች ላይ ይሻሩ?"</string>
-    <string name="dev_settings_warning_title" msgid="7244607768088540165">"የግንባታ ቅንጅቶችን ፍቀድ?"</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"የግንባታ ቅንብሮችን ፍቀድ?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"እነዚህ ቅንብሮች  የታሰቡት ለግንባታ አጠቃቀም ብቻ ናቸው። መሳሪያህን እና በሱ ላይ ያሉትን መተግበሪያዎች እንዲበለሹ ወይም በትክክል እንዳይሰሩ ሊያደርጉ ይችላሉ።"</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"መተግበሪያዎች በUSB በኩል ያረጋግጡ"</string>
     <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"በADB/ADT በኩል የተጫኑ መተግበሪያዎች ጎጂ ባህሪ ካላቸው ያረጋግጡ።"</string>
@@ -1407,7 +1414,7 @@
     <string name="battery_desc_apps" msgid="8530418792605735226">"በመተግበሪያ ጥቅም ላይ የዋለ ባትሪ"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"መተግበሪያውን አትጫን ወይም አቁም"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"መተግበሪያ እንዳይጠቀም ለመከላከል GPSን በእጅ ተቆጣጠር።"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"መተግበሪያው የባትሪ ፍጆታን ለመቀነስ ቅንጅቶችን ሊያቀርብ ይችላል"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"መተግበሪያው የባትሪ ፍጆታን ለመቀነስ ቅንብሮችን ሊያቀርብ ይችላል"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"በተጠቃሚው ስራ ላይ የዋለው ባትሪ"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g>ከተነቀለ ጀምሮ"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"በመጨረሻ ለ<xliff:g id="UNPLUGGED">%1$s</xliff:g>  አልተሰካም"</string>
@@ -1426,7 +1433,7 @@
     <string name="tts_settings" msgid="8186971894801348327">"ፅሁፍ-ወደ-ንግግር ቅንብሮች"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"የፅሁፍ- ወደ- ንግግር ውፅዓት"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ሁልጊዜም የእኔን ቅንብሮች ተጠቀም"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ከስር ያሉ ነባሪ ቅንብሮች የመተግበሪያ  ቅንጅቶችን ያግዳሉ"</string>
+    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ከስር ያሉ ነባሪ ቅንብሮች የመተግበሪያ  ቅንብሮችን ያግዳሉ"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"ነባሪ ቅንብሮች"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"ነባሪ አንቀሳቃሽ"</string>
     <string name="tts_default_synth_summary" msgid="6482936537135251690">"የንግግር ልምምድ አንቀሳቃሹን ለሚነገር ፅሁፍ ለመጠቀም ያዘጋጃል።"</string>
@@ -1441,7 +1448,7 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"የድምፅ ውሂብ ጫን"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"ለንግግር ልምምድ የሚጠየቀውን የድምፅ ውሂብ ጫን"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"ለንግግር ልምምድ የሚጠየቁ ድምፆች አስቀድመው በአግባቡ ተጭነዋል"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"ቅንብሮችዎተለውጠዋል።ይህ ምንድምፅእንደሚያወጡ ምሳሌነው።"</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"ቅንብሮችዎ ተለውጠዋል።ይህ ምን ድምፅ እንደሚያወጡ ምሳሌ ነው።"</string>
     <string name="tts_engine_error" msgid="3305141107104670703">"የመረጥከው አንቀሳቃሽ አይሄድም።"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"አዋቅር"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"ሌላ አንቀሳቃሽ ምረጥ"</string>
@@ -1490,6 +1497,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"ሁሉንም ምስክሮችአስወግድ"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"የሚታመን ማስረጃ"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"ታማኝ የCA  ምስክር አሳይ"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"የቁልፍ መክፈቻ ስርዓተ ጥለትህን ሳል"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"የአሳማኝ መታውቂያ ጭነትን ለማረጋገጥ የመክፈቻ ስርዓተ ጥለትህን መሳል አለብህ።"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1703,7 +1716,7 @@
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"የተንቀሳቃሽ ስልክ ውሂብ"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G ውሂብ"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G ውሂብ"</string>
-    <string name="data_usage_app_settings" msgid="8430240158135453271">"መተግበሪያ ቅንጅቶችን እይ"</string>
+    <string name="data_usage_app_settings" msgid="8430240158135453271">"መተግበሪያ ቅንብሮችን ይመልከቱ"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"በስተጀርባ ውሂብ አግድ?"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"የጀርባ ውሂብ በተንቀሳቃሽ ስልክ አውታረ መረብ ላይ አሰናክል። ከተገኙ የተንቀሳቃሽ ስልክ ያልሆኑ አውታረ መረቦች ስራ ላይ ይውላሉ።"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ለእዚህ ትግበራ የዳራ ውሂብ ለመገደብ፣ መጀመሪያ የተንቀሳቃሽ ውሂብ ወሰን አዘጋጅ።"</string>
@@ -1798,11 +1811,26 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"በማስፈጸም ላይ"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"ተጠቃሚዎች"</string>
     <string name="user_you_section" msgid="6247838798859425408">"እርስዎ"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"ሌሎች ተጠቃሚዎች"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"ተጠቃሚ አክል"</string>
+    <!-- no translation found for user_add_restricted (2355584640156396901) -->
+    <skip />
+    <!-- no translation found for user_add_restricted_summary (6627956758186349471) -->
+    <skip />
+    <!-- no translation found for user_add_trusted (557634297572871869) -->
+    <skip />
+    <!-- no translation found for user_add_trusted_summary (1118604533072902851) -->
+    <skip />
     <string name="user_summary_active" msgid="4740649452346004418">"ገቢር"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"ቦዝኗል"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"አልተዋቀረም"</string>
+    <!-- no translation found for user_trusted (6742122083463724471) -->
+    <skip />
+    <!-- no translation found for user_limited (5344145255529624480) -->
+    <skip />
     <string name="user_owner" msgid="3879126011135546571">"ባለቤት"</string>
     <string name="user_nickname" msgid="5148818000228994488">"ቅጽል ስም"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"አዲሰ ተጠቃሚ አክል"</string>
@@ -1825,6 +1853,12 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"አዲስ ተጠቃሚ በማከል ላይ…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"ተጠቃሚን ሰርዝ"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"ሰርዝ"</string>
+    <!-- no translation found for application_restrictions (8207332020898004394) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_header (3660449891478534440) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_settings_button (3841347287916635821) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ይህ ቅንብር እዚህ ጡባዊ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ይህ ቅንብር እዚህ ስልክ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ቋንቋ ይቀይሩ"</string>
@@ -1835,4 +1869,14 @@
     <string name="user_picture_title" msgid="7297782792000291692">"የፎቶ መታወቂያ"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"የስልክ ስርጭቶች"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"የሚታዩ የአስቸኳይ አደጋ ማንቂያዎች አይነቶች ምረጥ።"</string>
+    <!-- no translation found for user_restrictions_title (371835484894400390) -->
+    <skip />
+    <!-- no translation found for user_rename (8523499513614655279) -->
+    <skip />
+    <!-- no translation found for wizard_back (5567007959434765743) -->
+    <skip />
+    <!-- no translation found for wizard_next (3606212602795100640) -->
+    <skip />
+    <!-- no translation found for wizard_finish (3286109692700083252) -->
+    <skip />
 </resources>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5c878c5..7c43177 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -542,6 +542,14 @@
     <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>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_text_location_on (8135076005488914200) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_text_location_off (6323983741393280935) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_remember_choice (5340097010842405981) -->
+    <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>
@@ -603,6 +611,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"محمي باستخدام <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"، محمي باستخدام <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"لا شيء"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"لتحسين مستوى دقة تحديد الموقع ولأغراض أخرى، يحتاج <xliff:g id="APP_NAME">%1$s</xliff:g> إلى تشغيل البحث عن الشبكات، حتى مع إيقاف Wi-Fi."\n\n"هل تريد السماح بذلك لجميع التطبيقات التي تحتاج إلى فحص؟"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"سماح"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"رفض"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"أخفق التوصيل بالشبكة"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"حذف"</string>
@@ -1486,6 +1497,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"إزالة جميع الشهادات"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"بيانات اعتماد موثوقة"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"عرض شهادات CA الموثوقة"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ارسم نقش إلغاء القفل"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"يجب عليك رسم نقش إلغاء القفل لتأكيد تثبيت بيانات الاعتماد."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1794,11 +1811,26 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"فرض"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"المستخدمون"</string>
     <string name="user_you_section" msgid="6247838798859425408">"أنت"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"مستخدمون آخرون"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"إضافة مستخدم"</string>
+    <!-- no translation found for user_add_restricted (2355584640156396901) -->
+    <skip />
+    <!-- no translation found for user_add_restricted_summary (6627956758186349471) -->
+    <skip />
+    <!-- no translation found for user_add_trusted (557634297572871869) -->
+    <skip />
+    <!-- no translation found for user_add_trusted_summary (1118604533072902851) -->
+    <skip />
     <string name="user_summary_active" msgid="4740649452346004418">"نشط"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"غير نشط"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"لم يتم الإعداد."</string>
+    <!-- no translation found for user_trusted (6742122083463724471) -->
+    <skip />
+    <!-- no translation found for user_limited (5344145255529624480) -->
+    <skip />
     <string name="user_owner" msgid="3879126011135546571">"المالك"</string>
     <string name="user_nickname" msgid="5148818000228994488">"اللقب"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"إضافة مستخدم جديد"</string>
@@ -1821,6 +1853,12 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"جارٍ إضافة مستخدم جديد..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"حذف مستخدم"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"حذف"</string>
+    <!-- no translation found for application_restrictions (8207332020898004394) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_header (3660449891478534440) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_settings_button (3841347287916635821) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"يؤثر هذا الإعداد على جميع مستخدمي هذا الجهاز اللوحي."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"يؤثر هذا الإعداد على جميع مستخدمي هذا الهاتف."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"تغيير اللغة"</string>
@@ -1831,4 +1869,14 @@
     <string name="user_picture_title" msgid="7297782792000291692">"معرف الصورة"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"عمليات البث الخلوي"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"حدد أنواع تنبيهات الطوارئ لعرضها."</string>
+    <!-- no translation found for user_restrictions_title (371835484894400390) -->
+    <skip />
+    <!-- no translation found for user_rename (8523499513614655279) -->
+    <skip />
+    <!-- no translation found for wizard_back (5567007959434765743) -->
+    <skip />
+    <!-- no translation found for wizard_next (3606212602795100640) -->
+    <skip />
+    <!-- no translation found for wizard_finish (3286109692700083252) -->
+    <skip />
 </resources>

diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index faefdc9..b4fbef2 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml

@@ -218,10 +218,12 @@
     <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="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-be/strings.xml b/res/values-be/strings.xml
index 9b1cdde..808bbf0 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Сканіраванне заўсёды даступнае"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Дазволіць службе вызначэння месцазнаходжання Google і іншым прыкладанням сканіраваць сеткі, нават калі Wi-Fi адключаны"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Каб палепшыць дакладнасць вызначэння месцазнаходжання і для іншых мэтаў, Google і іншыя прыкладанні могуць сканіраваць бліжэйшыя сеткі, нават калі сувязь Wi-Fi адключаная. Калі вы не хочаце, каб гэта адбывалася, перайдзіце да пункту налад Пашыраныя &gt; Сканіраванне, які заўсёды даступны."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Прыкладанні могуць сканіраваць бліжэйшыя сеткі, нават калі Wi-Fi выключаны. Калі вы не жадаеце, каб гэта адбылося, перайдзіце да пункту \"Пашыраныя &gt; Сканіраванне\", які заўсёды даступны."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Не паказваць зноў."</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">"Аптымiзацыя Wi-Fi"</string>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Абаронены з дапамогай <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", абароненых з дапамогай <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Няма"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Каб павысіць дакладнасць размяшчэння і для іншых мэтаў, <xliff:g id="APP_NAME">%1$s</xliff:g> хоча ўключыць сеткавае сканаванне, нават калі Wi-Fi выключаны."\n\n"Дазволіць для ўсіх прыкладанняў, якія патрабуецца адсканаваць?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дазволіць"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Адхiлiць"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Падлучыцца"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Не атрымалася падключыцца да сеткі"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Забыць"</string>
@@ -883,10 +889,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>
-    <!-- no translation found for mvno_type (2543253857818336421) -->
-    <skip />
-    <!-- no translation found for mvno_match_data (4560671695220540466) -->
-    <skip />
+    <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Выдаліць усе сертыфікаты"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Давераныя паўнамоцтвы"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Паказаць правераныя сертыфікаты CA"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Намалюйце графiчны ключ разблакоўкі"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Каб пацвердзіць усталёўку ўлiковых дадзеных, намалюйце графiчны ключ разблакоўкі."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Забеспячэнне"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Карыстальнікі"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Вы"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Iншыя карыстальнікi"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Дадаць карыстальніка"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Дадаць карыстальніка з абмежаванымі правамі"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Карыстальнікі з абмежаванымі правамі могуць атрымаць доступ да прыкладанняў і змесціва, якія вы выбіраеце"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Дадаць даверанага карыстальніка"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Давераныя карыстальнікі не маюць абмежаванняў"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Актыўны"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Неактыўна"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не наладжана"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Давераныя"</string>
+    <string name="user_limited" msgid="5344145255529624480">"З абмежаванымі правамі"</string>
     <string name="user_owner" msgid="3879126011135546571">"Уладальнік"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Псеўданім"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Дад. новага карыстальніка"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Даданне новага карыстальніка..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Выдалiць карыстальніка"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Выдаліць"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Дазволіць прыкладанні і змесціва"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Прыкладанні з абмежаваннямі"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Разгарнуць параметры прыкладання"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Гэты параметр распаўсюджвае на ўсіх карыстальнікаў гэтага планшэта."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Гэты параметр распаўсюджвае на ўсіх карыстальнікаў гэтага тэлефона."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Змяніць мову"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Iдэнтыфiкатар фота"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Мабільнае вяшчанне"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Выберыце тыпы надзвычайных папярэджанняў для адлюстравання."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Дазволіць прыкладанні і змесціва"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПЕРАЙМЕНАВАЦЬ"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Назад"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Далей"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Завершыць"</string>
 </resources>

diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 8501aeb..10d6f2a 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml

@@ -218,10 +218,12 @@
     <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="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-bg/strings.xml b/res/values-bg/strings.xml
index ecd256a..b54bf21 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Сканирането е винаги налице"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Услугата за местоположения на Google и другите приложения да сканират за мрежи дори когато Wi-Fi е изключен"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"За подобряване на точността на местоположението и за други цели Google и останалите приложения може да сканират за мрежи в района дори когато Wi-Fi е изключен. Ако не искате това да се случва, отворете „Разширени“ &amp;gt „Сканирането винаги да е налице“."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Приложенията може да сканират за мрежи в района дори когато Wi-Fi е изключен. Ако не искате това да се случва, отворете „Разширени“ &gt; „Сканирането винаги да е налице“."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Да не се показва отново"</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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Защитено с <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", защитено с <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Няма"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"За да подобри точността на местоположението и за други цели, <xliff:g id="APP_NAME">%1$s</xliff:g> иска да включи сканирането за мрежи дори когато Wi-Fi е изключен."\n\n"Искате ли да разрешите това за всички приложения, които искат да сканират?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Разрешаване"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Отказ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Свързване"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Свързването с мрежата не бе успешно"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Забравяне"</string>
@@ -883,10 +889,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>
-    <!-- no translation found for mvno_type (2543253857818336421) -->
-    <skip />
-    <!-- no translation found for mvno_match_data (4560671695220540466) -->
-    <skip />
+    <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Премахване на всички сертификати"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Надеждни идент. данни"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показване на надеждни сертификати от сертифициращи органи"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Начертайте фигурата си за отключване"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Трябва да начертаете фигурата си за отключване, за да потвърдите инсталирането на идентификационни данни."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Налагане"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Потребители"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Вие"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Други потребители"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Потребител: Добавяне"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Огр. потреб.: Добав."</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Ограничените потребители имат достъп само до избраните от вас приложения и съдържание"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Дов. потреб.: Добав."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"За доверените потребители няма ограничения"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Активен"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Неактивен"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не е настроен"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Доверен"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Ограничен"</string>
     <string name="user_owner" msgid="3879126011135546571">"Собственик"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Псевдоним"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Добавяне на нов потребител"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Новият потребител се добавя…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Изтриване на потребителя"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Изтриване"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Разрешаване на приложения и съдържание"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничения"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Настройки за прилож.: Разгъв."</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Настройката засяга всички потребители на този таблет."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройката засяга всички потребители на този телефон."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Промяна на езика"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Идент. № на снимката"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Клетъчни излъчвания"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Изберете типовете спешни сигнали, които да се показват."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Разреш. на приложения и съдържание"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПРЕИМЕНУВАНЕ"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Назад"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Напред"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Край"</string>
 </resources>

diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index dcc9dc7..02cadad 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Cap"</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">"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 4499b1b..06c2cbc 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Permet cercar sempre"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Permet que el servei d\'ubicacions de Google i altres aplicacions cerquin xarxes, fins i tot si la Wi-Fi està desactivada."</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Per millorar la precisió de la ubicació i per a altres finalitats, Google i altres aplicacions poden cercar xarxes properes encara que la Wi-Fi estigui apagada. Si no vols que això passi, vés a Avançat &gt; Cerca sempre disponible."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les aplicacions poden cercar xarxes properes encara que la Wi-Fi estigui apagada. Si no vols que això passi, vés a Avançat &gt; Cerca sempre disponible."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"No m\'ho tornis a mostrar"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida amb <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida amb <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Cap"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per millorar la precisió de la ubicació i per a altres finalitats, <xliff:g id="APP_NAME">%1$s</xliff:g> vol activar la cerca de xarxes encara que no hi hagi cap connexió Wi-Fi."\n\n"Vols permetre-ho a totes les aplicacions que vulguin cercar xarxes?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permet"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Denega"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connecta"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"No s\'ha pogut connectar a la xarxa"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esborra"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Tipus de MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valor de MVNO"</string>
     <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>
@@ -1330,7 +1334,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Retard toca i mantén premut"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configuració"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activada"</string>
-    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivada"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivat"</string>
     <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Vols fer servir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> pot recopilar tot el text que escrius, excepte les contrasenyes. Això inclou les dades personals com ara els números de targetes de crèdit. També pot recopilar dades sobre les teves interaccions amb la tauleta."</string>
     <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> pot recopilar tot el text que escrius, excepte les contrasenyes. Això inclou les dades personals com ara els números de targetes de crèdit. També pot recopilar dades sobre les teves interaccions amb el telèfon."</string>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Elimina tots els certificats"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Certificats de confiança"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostra certificats de CA de confiança"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dibuixa el patró de desbloqueig"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Has de dibuixar el teu patró de desbloqueig per confirmar la instal·lació de les credencials."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"En aplicació"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Usuaris"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Tu"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Altres usuaris"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Afegeix un usuari"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Afeg. usuari limitat"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Els usuaris limitats només poden accedir a les aplicacions i al contingut que seleccionis"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Afegeix usuari conf."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Els usuaris de confiança no tenen restriccions"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Actiu"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Inactiu"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"No s\'ha configurat"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"De confiança"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Limitats"</string>
     <string name="user_owner" msgid="3879126011135546571">"Propietari"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Àlies"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Afegir un usuari nou"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"S\'està afegint un usuari nou..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Suprimeix l\'usuari"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Suprimeix"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Permet aplicacions i contingut"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacions amb restriccions"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Amplia configuració aplicació"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Aquesta configuració afecta tots els usuaris de la tauleta."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Aquesta configuració afecta tots els usuaris del telèfon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Canvi de l\'idioma"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Identificador de la foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Emissions mòbils"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona els tipus d\'alertes d\'emergència que es mostraran."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Permet aplicacions i contingut"</string>
+    <string name="user_rename" msgid="8523499513614655279">"CANVIA EL NOM"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Enrere"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Següent"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Acaba"</string>
 </resources>

diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 84edca2..0fa7e05 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml

@@ -218,10 +218,12 @@
     <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="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">"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 5d2d5f5..28bc49e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Hledání vždy zapnuto"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Povolit službě určování polohy Google a ostatním aplikacím hledat sítě, i když je síť Wi-Fi vypnutá"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Za účelem zvýšení přesnosti a k dalším účelům mohou aplikace Google a další aplikace vyhledávat sítě Wi-Fi v okolí, i když je Wi-Fi vypnuta. Chcete-li to zakázat, přejděte do části Pokročilé &gt; Hledání vždy zapnuto."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikace mohou vyhledávat sítě v okolí i v případě, že je Wi-Fi vypnuta. Chcete-li nastavení změnit, přejděte do části Pokročilé &gt; Hledání vždy zapnuto."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Tuto zprávu příště nezobrazovat"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpečení: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečení <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Žádné"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnout vyhledávání sítí (kvůli lepšímu určení polohy i kvůli jiným účelům) a hledat sítě i v případě, že je vypnut modul Wi-Fi."\n\n"Chcete tuto možnost povolit všem aplikacím, které chtějí vyhledávat sítě?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povolit"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Zamítnout"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Připojit"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Připojení k síti se nezdařilo."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstranit"</string>
@@ -672,7 +678,7 @@
     <string name="notification_sound_title" msgid="5137483249425507572">"Výchozí zvuk oznámení"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blikat kontrolkou oznámení"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Vyzváněcí tón"</string>
-    <string name="notification_volume_title" msgid="2012640760341080408">"Upozornění"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"Oznámení"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Použije hlasitost příchozích hovorů také pro oznámení"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Výchozí zvuk oznámení"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Média"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Typ MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Hodnota MVNO"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Odebrat všechny certifikáty"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Důvěryhodná pověření"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobrazit důvěryhodné certifikáty CA"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Proveďte bezpečnostní gesto"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Instalaci pověření je třeba potvrdit provedením bezpečnostního gesta."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Přísné"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Uživatelé"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Vy"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Další uživatelé"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Přidat uživatele"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Přidat uživ. s omez."</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Uživatelé s omezením přístupu mohou používat pouze aplikace a obsah, které vyberete."</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Přidat důvěr. uživ."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Důvěryhodní uživatelé nemají žádná omezení"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktivní"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktivní"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Není nastaveno"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Důvěryhodný"</string>
+    <string name="user_limited" msgid="5344145255529624480">"S omezeným přístupem"</string>
     <string name="user_owner" msgid="3879126011135546571">"Vlastník"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Přezdívka"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Přidat nového uživatele"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Přidávání nového uživatele…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Smazat uživatele"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Smazat"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Povolit aplikace a obsah"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikace s omezením"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbalit nastavení aplikace"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Toto nastavení ovlivní všechny uživatele tohoto tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Změna jazyka"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Hromadné zasílání zpráv v rámci buňky"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vyberte typy mimořádných upozornění, která chcete zobrazovat."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Povolit aplikace a obsah"</string>
+    <string name="user_rename" msgid="8523499513614655279">"PŘEJMENOVAT"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Zpět"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Další"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Dokončit"</string>
 </resources>

diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 34c243a..1dd8178 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Ingen"</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">"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 4e4d116..c1e7d83 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanning er altid tilgængelig"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Lad Googles placeringstjeneste og andre apps scanne efter netværk, selv når Wi-Fi er slået fra"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Google og andre apps scanner muligvis efter netværk i nærheden, selv når Wi-Fi er slukket, for at forbedre placeringsnøjagtighed og for andre formål. Hvis du ikke ønsker dette, kan du gå til Avanceret &gt; Scanning altid tilgængelig."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps kan søge efter netværk i nærheden, selv når Wi-Fi er slukket. Hvis du ikke ønsker, at dette sker, skal du gå til Avanceret &gt; Scanning altid tilgængelig."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Vis ikke igen"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"For at kunne angive mere nøjagtig placering og af andre grunde, ønsker <xliff:g id="APP_NAME">%1$s</xliff:g> at aktivere netværksscanning, selv når Wi-Fi er deaktiveret."\n\n"Vil du tillade dette for alle apps, der ønsker at scanne?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillad"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Afvis"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Forbind"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Der kunne ikke oprettes forbindelse til netværket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glem"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"MVNO-type"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-værdi"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Fjern alle certifikater"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Troværdige loginoplysninger"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vis troværdige CA-certifikater"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Tegn dit oplåsningsmønster"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du skal tegne dit oplåsningsmønster for at bekræfte en gendannelse af fabriksindstillingerne."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Håndhæver"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Brugere"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Dig"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Andre brugere"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Tilføj bruger"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Tilføj begrænset bruger"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Begrænsede brugere kan kun få adgang til apps og indhold, som du vælger"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Tilføj betroet bruger"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Betroede brugere har ingen begrænsninger"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktiv"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Ikke aktiv"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ikke konfigureret"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Betroet"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Begrænset"</string>
     <string name="user_owner" msgid="3879126011135546571">"Ejer"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Kaldenavn"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Tilføj ny bruger"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Tilføjer ny bruger..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Slet bruger"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Slet"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Tillad apps og indhold"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applikationer med begrænsninger"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Udvid indstillingerne for applikationen"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Denne indstilling påvirker alle brugere på denne tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne indstilling påvirker alle brugere på denne telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Skift sprog"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-id"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mobilmeddelelser"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vælg de typer af nødalarmer, der skal vises."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Tillad apps og indhold"</string>
+    <string name="user_rename" msgid="8523499513614655279">"OMDØB"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Tilbage"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Næste"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Udfør"</string>
 </resources>

diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 2117f7f..9035730 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Keine"</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">"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 10fa29d..086fd06 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -541,10 +541,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Erkennungsfunktion immer verfügbar"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Der Standortdienst von Google und andere Apps sollen auch bei deaktiviertem WLAN nach Netzwerken suchen."</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Zur Erhöhung der Standortgenauigkeit und aus anderen Gründen können Google und andere Apps auch bei deaktiviertem WLAN nach Netzwerken in der Nähe suchen. Wenn Sie das nicht möchten, können Sie dies unter \"Erweitert\" &gt; \"Scannen immer verfügbar\" ändern."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps können auch bei deaktiviertem WLAN nach Netzwerken in der Nähe suchen. Wenn Sie das nicht möchten, können Sie dies unter \"Erweitert\" &gt; \"Scannen immer verfügbar\" ändern."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Nicht erneut anzeigen"</string>
     <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>
@@ -606,6 +609,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Gesichert mit <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", gesichert mit <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Keine"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Zur Verbesserung der Standortgenauigkeit und zu anderen Zwecken möchte <xliff:g id="APP_NAME">%1$s</xliff:g> die Netzwerküberprüfung aktivieren, auch wenn das WLAN deaktiviert ist."\n\n"Möchten Sie dies für alle Apps zulassen, die eine Überprüfung durchführen möchten?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zulassen"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Ablehnen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Netzwerkverbindung konnte nicht hergestellt werden."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Entfernen"</string>
@@ -884,10 +890,8 @@
     <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="mvno_type" msgid="2543253857818336421">"MVNO-Typ"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-Wert"</string>
     <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>
@@ -1491,6 +1495,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alle Zertifikate entfernen"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertrauensw. Anmeldedaten"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrauenswürdige CA-Zertifikate ansehen"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Installieren der Anmeldedaten zu bestätigen."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1799,11 +1809,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Strikt"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Nutzer"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Ich"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Andere Nutzer"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Nutzer hinzufügen"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Eingeschr. Nutzer"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Eingeschränkte Nutzer können nur auf die von Ihnen ausgewählten Apps und Inhalte zugreifen."</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Vertrauensw. Nutzer"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Für vertrauenswürdige Nutzer gelten keine Einschränkungen."</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktiv"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Nicht aktiv"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nicht eingerichtet"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Vertrauenswürdig"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Eingeschränkt"</string>
     <string name="user_owner" msgid="3879126011135546571">"Eigentümer"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Alias"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Neuen Nutzer hinzufügen"</string>
@@ -1826,6 +1845,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Neuer Nutzer wird hinzugefügt…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Nutzer löschen"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Löschen"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Apps und Inhalte zulassen"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps mit Einschränkungen"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"App-Einstellungen erweitern"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Diese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Sprache ändern"</string>
@@ -1836,4 +1858,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell Broadcasts"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Wählen Sie aus, welche Notfallbenachrichtigungen angezeigt werden sollen."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Apps und Inhalte zulassen"</string>
+    <string name="user_rename" msgid="8523499513614655279">"Umbenennen"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Zurück"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Weiter"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Fertig"</string>
 </resources>

diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 8f6e1bc..6a2ceb1 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml

@@ -218,10 +218,12 @@
     <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="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-el/strings.xml b/res/values-el/strings.xml
index 29ad675..72ba073 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Σάρωση πάντα διαθέσιμη"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Παροχή στην υπηρεσία εντοπισμού τοποθεσίας της Google και σε άλλες εφαρμογές, της δυνατότητας σάρωσης για δίκτυα, ακόμη και όταν το Wi-Fi είναι απενεργοποιημένο"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Για τη βελτίωση της ακρίβειας και για άλλους σκοπούς, το Google και άλλες εφαρμογές ενδέχεται να πραγματοποιούν σάρωση για κοντινά δίκτυα Wi-Fi, ακόμη και αν το Wi-Fi είναι απενεργοποιημένο. Αν δεν επιθυμείτε να συμβαίνει αυτό, μεταβείτε στη ρύθμιση Σύνθετες &gt; Πάντα διαθέσιμη σάρωση."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Οι εφαρμογές ενδέχεται να κάνουν σάρωση για κοντινά δίκτυα, ακόμη και αν το Wi-Fi είναι απενεργοποιημένο. Αν δεν επιθυμείτε να συμβαίνει αυτό, μεταβείτε στη ρύθμιση Σύνθετες &gt; Πάντα διαθέσιμη σάρωση."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Να μην εμφανιστεί ξανά"</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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Ασφαλισμένα με <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ασφαλισμένο με <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Καμία"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Για τη βελτίωση της ακρίβειας της τοποθεσίας σας και για άλλους σκοπούς, η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> επιθυμεί να ενεργοποιήσει τη σάρωση δικτύων, ακόμη και όταν το Wi-Fi είναι απενεργοποιημένο."\n\n"Να επιτρέπεται αυτή η ενέργεια για όλες τις εφαρμογές που επιθυμούν σάρωση;"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Να επιτραπεί"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Απόρριψη"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Σύνδεση"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Αποτυχία σύνδεσης στο δίκτυο"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Να διαγραφεί από τη μνήμη"</string>
@@ -883,10 +889,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>
-    <!-- no translation found for mvno_type (2543253857818336421) -->
-    <skip />
-    <!-- no translation found for mvno_match_data (4560671695220540466) -->
-    <skip />
+    <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Κατάργηση όλων των πιστοποιητικών"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Αξιόπιστα διαπιστευτήρια"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Προβολή αξιόπιστων πιστοποιητικών CA"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την εγκατάσταση των διαπιστευτηρίων."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Επιβολή"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Χρήστες"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Εσείς"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Άλλοι χρήστες"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Προσθήκη χρήστη"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Προσθ. περιορ.χρήστη"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Οι περιορισμένοι χρήστες έχουν πρόσβαση μόνο στις εφαρμογές και το περιεχόμενο που επιλέγετε"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Προσθ. αξιόπ. χρήστη"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Οι αξιόπιστοι χρήστες δεν έχουν περιορισμούς"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Ενεργός"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Μη ενεργός"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Δεν υπάρχει ρύθμιση"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Αξιόπιστος"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Περιορισμένος"</string>
     <string name="user_owner" msgid="3879126011135546571">"Κάτοχος"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Ψευδώνυμο"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Προσθήκη νέου χρήστη"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Προσθήκη νέου χρήστη…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Διαγραφή χρήστη"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Διαγραφή"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Να επιτρέπονται εφαρμογές και περιεχόμενο"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Εφαρμογές με περιορισμούς"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Επέκταση ρυθμίσεων για εφαρμ."</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Αυτή η ρύθμιση επηρεάζει όλους τους χρήστες στο συγκεκριμένο tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Αυτή η χρήση επηρεάζει όλους τους χρήστες στο συγκεκριμένο τηλέφωνο."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Αλλαγή γλώσσας"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Αναγνωριστικό φωτογραφίας"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Εκπομπές κινητής τηλεφωνίας"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Επιλέξτε τους τύπους ειδοποιήσεων έκτακτης ανάγκης που θα εμφανίζονται."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Να επιτρ. εφαρμογές και περιεχόμενο"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ΜΕΤΟΝΟΜΑΣΙΑ"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Πίσω"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Επόμενο"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Τέλος"</string>
 </resources>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 015b215..640f58d 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -542,6 +542,11 @@
     <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>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
+    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Don\'t show again"</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>
@@ -603,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"None"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"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\n"Allow this for all apps that want to scan?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Deny"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
@@ -1486,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remove all certificates"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Trusted credentials"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Display trusted CA certificates"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Draw your unlock pattern"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"You need to draw your unlock pattern to confirm credential installation."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1794,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
     <string name="user_you_section" msgid="6247838798859425408">"You"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Other users"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Add limited user"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Limited users can only access the apps and content that you select"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Add trusted user"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Trusted users have no restrictions"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Active"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Not active"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Not set up"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Trusted"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Limited"</string>
     <string name="user_owner" msgid="3879126011135546571">"Owner"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Nickname"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Add new user"</string>
@@ -1821,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Adding new user…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Delete user"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Delete"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"This setting affects all users on this tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"This setting affects all users on this phone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Change language"</string>
@@ -1831,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mobile broadcasts"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Select the types of emergency alerts to display."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Allow apps and content"</string>
+    <string name="user_rename" msgid="8523499513614655279">"RENAME"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Back"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Next"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Finish"</string>
 </resources>

diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index d20c39e..ce76840 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml

@@ -218,10 +218,12 @@
     <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="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">"Dispositivo de almacenamiento interno"</item>
     <item msgid="3738430123799803530">"Tarjeta SD desmontable"</item>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 59c84d7..de737ce 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Búsqueda siempre disponible"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Permite al servicio de ubicaciones y a otras aplicaciones de Google buscar redes, incluso con el Wi-Fi apagado"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mejorar la precisión de la ubicación y para otros fines, Google y otras aplicaciones pueden explorar las redes cercanas, incluso cuando Wi-Fi esté desactivado. Si no quieres que esto ocurra, ve a Avanzado &gt; Exploración siempre disponible."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Las aplicaciones pueden explorar las redes cercanas, incluso cuando Wi-Fi esté desactivado. Si no quieres que esto ocurra, ve a Avanzado &gt; Exploración siempre disponible."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"No volver a mostrar"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda en redes, incluso cuando la red Wi-Fi esté desactivada."\n\n"¿Quieres permitir esta acción para todas las aplicaciones que desees buscar?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Denegar"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"No se pudo establecer conexión con la red."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Tipo de OMV"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valor de OMV"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminar todos los certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenciales de confianza"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Crea tu patrón de desbloqueo."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Debes crear tu patrón de desbloqueo para confirmar la instalación de las credenciales."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1592,7 +1602,7 @@
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Tocar para sincronizar ahora<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Calendario"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contactos"</string>
     <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Te damos la bienvenida a Google Sync"</font>"  "\n"Con este software de Google, puedes sincronizar tus datos y acceder a tus contactos, citas y más desde cualquier lugar."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Conf. de sincronización de aplicación"</string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatorio"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Usuarios"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Tú"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Otros usuarios"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Agregar usuario"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Agregar us. restrin."</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Los usuarios restringidos solo pueden acceder a las aplicaciones y al contenido que seleccionas."</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Agregar us. confiab."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Los usuarios de confianza no tienen restricciones."</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Activo"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Inactivo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"No configurado"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"De confianza"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Restringido"</string>
     <string name="user_owner" msgid="3879126011135546571">"Propietario"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Seudónimo"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Agregar usuario nuevo"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Agregando usuario nuevo..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Eliminar usuario"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Eliminar"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir config. a aplicación"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuración afecta a todos los usuarios de esta tableta."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Emisiones móviles"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia para mostrar."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Permitir aplicaciones y contenido"</string>
+    <string name="user_rename" msgid="8523499513614655279">"CAMBIAR NOMBRE"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Atrás"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Siguiente"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Finalizar"</string>
 </resources>

diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 894d685..fe1cf2e 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Ninguna"</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">"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 1bc1d94..da57a53 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -26,8 +26,8 @@
     <item quantity="one" msgid="5295687242294085452">"Solo te queda <xliff:g id="STEP_COUNT">%1$d</xliff:g> paso para ser un desarrollador."</item>
     <item quantity="other" msgid="6722953419953594148">"Solo te quedan <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos para ser un desarrollador."</item>
   </plurals>
-    <string name="show_dev_on" msgid="1110711554982716293">"¡Ahora eres un desarrollador!"</string>
-    <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres un desarrollador."</string>
+    <string name="show_dev_on" msgid="1110711554982716293">"¡Ahora están activadas las opciones de desarrollo!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, están activadas las opciones de desarrollo."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"CONEXIONES INALÁMBRICAS Y REDES"</string>
     <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
@@ -54,7 +54,7 @@
     <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"Sonando"</string>
     <string name="radioInfo_phone_offhook" msgid="4174402846862780998">"Llamada en curso"</string>
     <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"Desconectada"</string>
-    <string name="radioInfo_data_connecting" msgid="8404571440697917823">"Estableciendo conexión..."</string>
+    <string name="radioInfo_data_connecting" msgid="8404571440697917823">"Estableciendo conexión"</string>
     <string name="radioInfo_data_connected" msgid="7074301157399238697">"Conectado"</string>
     <string name="radioInfo_data_suspended" msgid="5315325487890334196">"Suspendido"</string>
     <string name="radioInfo_unknown" msgid="737385314432468266">"desconocido"</string>
@@ -89,7 +89,7 @@
     <string name="battery_info_awake_plugged" msgid="176716874713478188">"Tiempo de actividad durante la carga:"</string>
     <string name="battery_info_screen_on" msgid="376277447175613889">"Pantalla de duración de encendido"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconocido"</string>
-    <string name="battery_info_status_charging" msgid="1705179948350365604">"Cargando..."</string>
+    <string name="battery_info_status_charging" msgid="1705179948350365604">"Cargando"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
     <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(conexiones inalámbricas)"</string>
@@ -135,10 +135,10 @@
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sin audio multimedia)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sin teléfono ni multimedia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectada"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"Estableciendo conexión..."</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Estableciendo conexión…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Sincronizando..."</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Sincronizando…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sin nombre"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Buscando"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No hay dispositivos Bluetooth cercanos."</string>
@@ -158,7 +158,7 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Una aplicación quiere activar el Bluetooth y hacer visible tu tablet para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Una aplicación quiere activar el Bluetooth y hacer visible tu teléfono para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activando Bluetooth…"</string>
-    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desactivando Bluetooth..."</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desactivando Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conexión automática"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitud para establecer conexión de Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Toca para conectarte a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
@@ -228,7 +228,7 @@
     <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"alternar comprobación de DNS"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"Ajustes/información específica de OEM"</string>
     <string name="band_mode_title" msgid="954174198903776205">"Establecer banda GSM/UMTS"</string>
-    <string name="band_mode_loading" msgid="548764766363847336">"Cargando lista de bandas..."</string>
+    <string name="band_mode_loading" msgid="548764766363847336">"Cargando lista de bandas…"</string>
     <string name="band_mode_set" msgid="5730560180249458484">"Establecer"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Con error"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Correcto"</string>
@@ -246,7 +246,7 @@
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"La tarjeta SD se ha extraído mientras estaba en uso."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes usados:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Buscando archivos almac USB…"</string>
-    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Buscando medios en tarjeta SD..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Buscando medios en tarjeta SD…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Almacenamiento USB activado como solo lectura"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"La tarjeta SD está activada en modo de solo lectura."</string>
     <string name="skip_label" msgid="47510779345218297">"Saltar"</string>
@@ -443,7 +443,7 @@
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"No se ha podido establecer conexión con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Buscar dispositivos"</string>
     <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"Buscar dispositivos"</string>
-    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Buscando..."</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Buscando…"</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Ajustes del dispositivo"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositivos sincronizados"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Dispositivos disponibles"</string>
@@ -487,8 +487,8 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Uso de la transferencia de archivos"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Usar para entrada"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usar para acceder a Internet"</string>
-    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Ajustes del conector"</string>
-    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Uso del conector para audio"</string>
+    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Ajustes de la base"</string>
+    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Uso de la base para audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz del teléfono"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y contenido multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ajustes de recordatorio"</string>
@@ -500,7 +500,7 @@
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Sin pantallas inalámbricas cercanas"</string>
     <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Pantallas sincronizadas"</string>
     <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispositivos disponibles"</string>
-    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando..."</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectada"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Ajustes de pantalla"</string>
@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Búsqueda siempre disponible"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Permitir que el servicio de ubicación de Google y otras aplicaciones busquen redes, aunque la conexión Wi-Fi esté desactivada"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Con el fin de mejorar la precisión de la ubicación y otros aspectos, Google y otras aplicaciones pueden buscar redes cercanas, aunque la conexión Wi-Fi esté desactivada. Si no quieres que esto ocurra, accede a Avanzadas &gt; Búsqueda siempre disponible."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Las aplicaciones pueden buscar redes cercanas, aunque la conexión Wi-Fi esté desactivada. Si no quieres que esto ocurra, accede a Avanzadas &gt; Búsqueda siempre disponible."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"No volver a mostrar"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes aunque la conexión Wi-Fi esté desactivada."\n\n"¿Permitir para todas las aplicaciones que quieran buscar redes?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Rechazar"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Establecer conexión"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Error al conectar a la red"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Borrar"</string>
@@ -678,7 +684,7 @@
     <string name="media_volume_title" msgid="3576565767317118106">"Multimedia"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Establecer volumen para música y vídeos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarma"</string>
-    <string name="dock_settings_summary" msgid="455802113668982481">"Ajustes de audio del conector adjunto"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"Ajustes de audio de la base"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Sonar al marcar número"</string>
     <string name="sound_effects_enable_title" msgid="1171590821131077296">"Sonido al tocar"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sonido de pantalla de bloqueo"</string>
@@ -693,22 +699,22 @@
     <string name="volume_notification_mute" msgid="7955193480006444159">"Silenciar notificaciones"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Silenciar alarmas"</string>
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar al sonar"</string>
-    <string name="dock_settings" msgid="1820107306693002541">"Conector"</string>
-    <string name="dock_settings_title" msgid="9161438664257429372">"Ajustes del conector"</string>
+    <string name="dock_settings" msgid="1820107306693002541">"Base"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"Ajustes de la base"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Ajustes de la base"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Ajustes del conector del coche adjunto"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Ajustes de la base del vehículo"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet no conectado"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Teléfono no conectado"</string>
-    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Ajustes del conector adjunto"</string>
-    <string name="dock_not_found_title" msgid="3290961741828952424">"No se ha encontrado el conector"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Para configurar el audio del conector, debes insertar el tablet en el conector."</string>
-    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Para configurar el audio del conector, debes insertar el teléfono en el conector."</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Ajustes de la base"</string>
+    <string name="dock_not_found_title" msgid="3290961741828952424">"No se ha encontrado la base"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Para configurar el audio de la base, debes insertar el tablet en la base."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Para configurar el audio de la base, debes insertar el teléfono en la base."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Sonido al insertar dispositivo"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproducir sonido al insertar o extraer el tablet del conector"</string>
-    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproducir sonido al insertar o extraer el teléfono del conector"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reproducir sonido al insertar o extraer el tablet del conector"</string>
-    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reproducir sonido al insertar o extraer el teléfono del conector"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproducir sonido al insertar o extraer el tablet de la base"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproducir sonido al insertar o extraer el teléfono de la base"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reproducir sonido al insertar o extraer el tablet de la base"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reproducir sonido al insertar o extraer el teléfono de la base"</string>
     <string name="account_settings" msgid="6403589284618783461">"Cuentas"</string>
     <string name="search_settings" msgid="1910951467596035063">"Búsqueda"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Administrar historial y configuración de búsqueda"</string>
@@ -725,10 +731,10 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecciona una categoría"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Salvapantallas"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Cuando el dispositivo esté en un conector o inactivo y cargando"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Cuando el dispositivo esté en una base o inactivo y cargando"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ambos casos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando el dispositivo esté en un conector"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando el dispositivo esté en una base"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Para controlar lo que ocurre cuando el teléfono está conectado o inactivo, debes activar el salvapantallas."</string>
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Cuándo activarlo"</string>
@@ -806,7 +812,7 @@
     <string name="memory_available" msgid="5052397223077021181">"Disponible"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (solo lectura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espacio total"</string>
-    <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando…"</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicaciones (datos aplicaciones y contenido multimedia)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Descargas"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Tipo de OMV"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valor de OMV"</string>
     <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>
@@ -988,11 +992,11 @@
     <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencias de código abierto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Se ha producido un problema al intentar cargar las licencias."</string>
-    <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando..."</string>
+    <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Información de seguridad"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguridad"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="232523852222964470">"No tienes conexión de datos. Para ver esta información, accede a %s desde cualquier ordenador conectado a Internet."</string>
-    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando..."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Selecciona tu contraseña"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Elige un patrón"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Selecciona tu PIN"</string>
@@ -1101,7 +1105,7 @@
     <string name="internal_storage" msgid="1584700623164275282">"Almacenamiento interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Almacenamiento USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Tarjeta SD"</string>
-    <string name="recompute_size" msgid="7722567982831691718">"Recalculando tamaño..."</string>
+    <string name="recompute_size" msgid="7722567982831691718">"Recalculando tamaño…"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"¿Eliminar datos de la aplicación?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"Todos los datos de esta aplicación se eliminarán de forma permanente. Esto incluye todos los archivos, configuración, cuentas, bases de datos, etc."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Aceptar"</string>
@@ -1237,7 +1241,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Eliminar"</string>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"No tienes ninguna palabra en el diccionario del usuario. Toca el botón Añadir (+) para añadir una palabra."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Para todos los idiomas"</string>
-    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Más idiomas..."</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Más idiomas…"</string>
     <string name="testing" msgid="6584352735303604146">"Prueba"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Información del tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Información sobre el teléfono"</string>
@@ -1349,7 +1353,7 @@
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso de la batería desde que se restableció"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> de batería"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> desde que se cargó"</string>
-    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Cargando..."</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Cargando"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Pantalla encendida"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activado"</string>
     <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
@@ -1469,8 +1473,8 @@
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"activado"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"desactivado"</string>
-    <string name="gadget_state_turning_on" msgid="3395992057029439039">"activando..."</string>
-    <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivando..."</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"activando"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivando"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminar todos los certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Certificados de confianza"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dibuja tu patrón de desbloqueo."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Debes dibujar tu patrón de desbloqueo para confirmar la instalación de las credenciales."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1555,17 +1565,17 @@
     <string name="wifi_setup_forget" msgid="2562847595567347526">"Borrar"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"Guardar"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancelar"</string>
-    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Buscando redes..."</string>
+    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Buscando redes…"</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Toca en una red para conectarte a ella"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Establecer conexión con red existente"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectar con red no segura"</string>
     <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Introducir configuración de red"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Establecer conexión con red nueva"</string>
-    <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Conectando..."</string>
+    <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Conectando…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Ir al siguiente paso"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP no compatible"</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"No puedes definir una conexión Wi-Fi EAP durante la configuración, pero puedes hacerlo cuando haya finalizado a través de Ajustes &gt; Conexiones inalámbricas y redes."</string>
-    <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Conectando (puede tardar unos minutos)..."</string>
+    <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Conectando (puede tardar unos minutos)…"</string>
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Siguiente"</b>" para continuar con el proceso de configuración."\n\n"Toca "<b>"Atrás"</b>" para conectarte a otra red Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronización habilitada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronización inhabilitada"</string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatorio"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Usuarios"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Tú"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Otros usuarios"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Añadir usuario"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Añadir usuario limit"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Los usuarios limitados solo pueden acceder a las aplicaciones y al contenido que selecciones."</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Añadir usuario conf"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Los usuarios de confianza no tienen restricciones."</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Activo"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Inactivo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Sin configurar"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"De confianza"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Con límites"</string>
     <string name="user_owner" msgid="3879126011135546571">"Propietario"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Apodo"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Añadir nuevo usuario"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Añadiendo nuevo usuario…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Eliminar usuario"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Eliminar"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ampliar ajustes de aplicación"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuración afecta a todos los usuarios de este tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este teléfono."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Difusiones móviles"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia que quieres ver."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Permitir aplicaciones y contenido"</string>
+    <string name="user_rename" msgid="8523499513614655279">"CAMBIAR NOMBRE"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Volver"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Siguiente"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Finalizar"</string>
 </resources>

diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 36c94c5..e72eb1d 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Puudub"</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">"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 6286c02..536e5ce 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -540,9 +540,15 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Skannimine on alati saadaval"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Luba Google\'i asukohateenusel ja muudel rakendustel võrke skannida ka juhul, kui WiFi on välja lülitatud"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <!-- no translation found for wifi_scan_notify_text_location_on (8135076005488914200) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_text_location_off (6323983741393280935) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_remember_choice (5340097010842405981) -->
     <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>
@@ -605,6 +611,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Kaitstud turbega <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", kaitstud turbega <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Puudub"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Täpsema asukoha ja muude toimingute jaoks tahab rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> võrkude skannimise sisse lülitada, isegi kui WiFi on välja lülitatud."\n\n"Kas lubada see kõigi rakenduste jaoks, mis skannida tahavad?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Luba"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Keela"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ühenda"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Võrguga ühenduse loomine ebaõnnestus"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unusta"</string>
@@ -883,10 +892,8 @@
     <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="mvno_type" msgid="2543253857818336421">"MVNO tüüp"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO väärtus"</string>
     <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>
@@ -1490,6 +1497,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Kõikide sertifikaatide eemaldamine"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Usaldusväärsed mandaadid"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Usaldusväärsete CA-sertifikaatide kuvamine"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Joonistage oma luku avamise muster"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Mandaadi installimise kinnitamiseks tuleb teil joonistada luku avamise muster."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1811,26 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Jõustumisel"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Kasutajad"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Teie"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Teised kasutajad"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Kasutaja lisamine"</string>
+    <!-- no translation found for user_add_restricted (2355584640156396901) -->
+    <skip />
+    <!-- no translation found for user_add_restricted_summary (6627956758186349471) -->
+    <skip />
+    <!-- no translation found for user_add_trusted (557634297572871869) -->
+    <skip />
+    <!-- no translation found for user_add_trusted_summary (1118604533072902851) -->
+    <skip />
     <string name="user_summary_active" msgid="4740649452346004418">"Aktiivne"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Pole aktiivne"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Pole seadistatud"</string>
+    <!-- no translation found for user_trusted (6742122083463724471) -->
+    <skip />
+    <!-- no translation found for user_limited (5344145255529624480) -->
+    <skip />
     <string name="user_owner" msgid="3879126011135546571">"Omanik"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Hüüdnimi"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Uue kasutaja lisamine"</string>
@@ -1825,6 +1853,12 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Uue kasutaja lisamine ..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Kasutaja kustutamine"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Kustuta"</string>
+    <!-- no translation found for application_restrictions (8207332020898004394) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_header (3660449891478534440) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_settings_button (3841347287916635821) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Seade mõjutab kõiki tahvelarvuti kasutajaid."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Seade mõjutab kõiki telefoni kasutajaid."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Muuda keelt"</string>
@@ -1835,4 +1869,14 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Kärjeteated"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Valige kuvamiseks hädaolukorra märguannete tüübid."</string>
+    <!-- no translation found for user_restrictions_title (371835484894400390) -->
+    <skip />
+    <!-- no translation found for user_rename (8523499513614655279) -->
+    <skip />
+    <!-- no translation found for wizard_back (5567007959434765743) -->
+    <skip />
+    <!-- no translation found for wizard_next (3606212602795100640) -->
+    <skip />
+    <!-- no translation found for wizard_finish (3286109692700083252) -->
+    <skip />
 </resources>

diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index f6a7216..76de88b 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml

@@ -218,10 +218,12 @@
     <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="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-fa/strings.xml b/res/values-fa/strings.xml
index 9ab9c81..a78959a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -540,9 +540,15 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"اسکن کردن همواره در دسترس باشد"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"به خدمات موقعیت مکانی و دیگر برنامه‌های Google اجازه می‌دهد برای یافتن شبکه‌ها حتی هنگامی که Wi-Fi خاموش است، جستجو کنند."</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <!-- no translation found for wifi_scan_notify_text_location_on (8135076005488914200) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_text_location_off (6323983741393280935) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_remember_choice (5340097010842405981) -->
     <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"هنگام خواب، Wi-Fi را روشن بگذارید"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"هنگام تغییر تنظیمات مشکلی رخ داد"</string>
@@ -605,6 +611,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"ایمن شده با <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"، ایمن شده با <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"هیچکدام"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"برای بهبود دقت موقعیت مکانی و مقاصد دیگر، <xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد اسکن کردن شبکه را فعال کند، حتی هنگامی که Wi-Fi خاموش است."\n\n"این مورد را برای همه برنامه‌هایی که می‌خواهند اسکن کنند مجاز می‌کنید؟"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"مجاز"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"رد کردن"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"اتصال به شبکه برقرار نشد"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"فراموش کردن"</string>
@@ -883,10 +892,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>
-    <!-- no translation found for mvno_type (2543253857818336421) -->
-    <skip />
-    <!-- no translation found for mvno_match_data (4560671695220540466) -->
-    <skip />
+    <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>
@@ -1490,6 +1497,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"حذف تمام گواهی‌ها"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"اطلاعات کاربری قابل اطمینان"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"نمایش گواهی‌های CA قابل اطمینان"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"رسم الگوی بازگشایی"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"باید الگوی بازگشایی را رسم کنید تا نصب مدارک صلاحیت تأیید شود."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1811,26 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"در حال اعمال"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"کاربران"</string>
     <string name="user_you_section" msgid="6247838798859425408">"شما"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"کاربران دیگر"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"افزودن کاربر"</string>
+    <!-- no translation found for user_add_restricted (2355584640156396901) -->
+    <skip />
+    <!-- no translation found for user_add_restricted_summary (6627956758186349471) -->
+    <skip />
+    <!-- no translation found for user_add_trusted (557634297572871869) -->
+    <skip />
+    <!-- no translation found for user_add_trusted_summary (1118604533072902851) -->
+    <skip />
     <string name="user_summary_active" msgid="4740649452346004418">"فعال"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"غیرفعال"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"تنظیم نشده"</string>
+    <!-- no translation found for user_trusted (6742122083463724471) -->
+    <skip />
+    <!-- no translation found for user_limited (5344145255529624480) -->
+    <skip />
     <string name="user_owner" msgid="3879126011135546571">"مالک"</string>
     <string name="user_nickname" msgid="5148818000228994488">"نام مستعار"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"اضافه کردن کاربر جدید"</string>
@@ -1825,6 +1853,12 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"درحال اضافه کردن کاربران جدید..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"حذف کاربر"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"حذف"</string>
+    <!-- no translation found for application_restrictions (8207332020898004394) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_header (3660449891478534440) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_settings_button (3841347287916635821) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"این تنظیم روی همه کاربران موجود در این رایانه لوحی تأثیر می‌گذارد."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"این تنظیم روی همه کاربران موجود در این تلفن تأثیر می‌گذارد."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"تغییر زبان"</string>
@@ -1835,4 +1869,14 @@
     <string name="user_picture_title" msgid="7297782792000291692">"کارت شناسایی عکس‌دار"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"پخش‌های سلولی"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"انواع هشدارهای اضطراری را برای نمایش انتخاب کنید."</string>
+    <!-- no translation found for user_restrictions_title (371835484894400390) -->
+    <skip />
+    <!-- no translation found for user_rename (8523499513614655279) -->
+    <skip />
+    <!-- no translation found for wizard_back (5567007959434765743) -->
+    <skip />
+    <!-- no translation found for wizard_next (3606212602795100640) -->
+    <skip />
+    <!-- no translation found for wizard_finish (3286109692700083252) -->
+    <skip />
 </resources>

diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 3f18931..a07a248 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Ei mitään"</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">"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 f58da88..a0c8880 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -540,9 +540,15 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Haku aina käytettävissä"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Anna Googlen sijaintipalvelun ja muiden sovellusten hakea verkkoja, vaikka wifi-yhteys olisi pois käytöstä"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <!-- no translation found for wifi_scan_notify_text_location_on (8135076005488914200) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_text_location_off (6323983741393280935) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_remember_choice (5340097010842405981) -->
     <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>
@@ -605,6 +611,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Salaus: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", salaus: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ei mitään"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa parantaa sijainnin tarkkuutta ja suorittaa muita toimintoja ottamalla verkon etsinnän käyttöön, vaikka wifi-yhteys ei ole käytössä."\n\n"Annetaanko tämä lupa kaikille sovelluksille, jotka haluavat etsiä verkkoja?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Salli"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Estä"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Yhdistä"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Yhteyden muodostaminen verkkoon epäonnistui."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unohda"</string>
@@ -883,10 +892,8 @@
     <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="mvno_type" msgid="2543253857818336421">"MVNO-tyyppi"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-arvo"</string>
     <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>
@@ -1490,6 +1497,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Poista kaikki varmenteet"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Luotetut todennustiedot"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Näytä luotetut CA-varmenteet"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Piirrä lukituksenpoistokuvio"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Vahvista kirjautumistunnuksien asennus piirtämällä lukituksenpoistokuviosi."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1811,26 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Täytäntöönpano"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Käyttäjät"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Sinä"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Muut käyttäjät"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Lisää käyttäjä"</string>
+    <!-- no translation found for user_add_restricted (2355584640156396901) -->
+    <skip />
+    <!-- no translation found for user_add_restricted_summary (6627956758186349471) -->
+    <skip />
+    <!-- no translation found for user_add_trusted (557634297572871869) -->
+    <skip />
+    <!-- no translation found for user_add_trusted_summary (1118604533072902851) -->
+    <skip />
     <string name="user_summary_active" msgid="4740649452346004418">"Aktiivinen"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Ei aktiivinen"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ei määritetty"</string>
+    <!-- no translation found for user_trusted (6742122083463724471) -->
+    <skip />
+    <!-- no translation found for user_limited (5344145255529624480) -->
+    <skip />
     <string name="user_owner" msgid="3879126011135546571">"Omistaja"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Lempinimi"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Lisää uusi käyttäjä"</string>
@@ -1825,6 +1853,12 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Lisätään uutta käyttäjää..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Poista käyttäjä"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Poista"</string>
+    <!-- no translation found for application_restrictions (8207332020898004394) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_header (3660449891478534440) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_settings_button (3841347287916635821) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Tämä asetus vaikuttaa kaikkiin tämän tablet-laitteen käyttäjiin."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Vaihda kieltä"</string>
@@ -1835,4 +1869,14 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Kuvatunnus"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell Broadcast -lähetykset"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Valitse näytettävät hätäilmoitukset."</string>
+    <!-- no translation found for user_restrictions_title (371835484894400390) -->
+    <skip />
+    <!-- no translation found for user_rename (8523499513614655279) -->
+    <skip />
+    <!-- no translation found for wizard_back (5567007959434765743) -->
+    <skip />
+    <!-- no translation found for wizard_next (3606212602795100640) -->
+    <skip />
+    <!-- no translation found for wizard_finish (3286109692700083252) -->
+    <skip />
 </resources>

diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 858f539..b044807 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Aucun"</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">"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 90a0e39..6a88da2 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Recherche toujours disponible"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Autoriser le service de localisation de Google et les autres applications à rechercher des réseaux, même si le Wi-Fi est désactivé"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pour améliorer la précision, entre autres, le service de localisation de Google et d\'autres applications peuvent rechercher des réseaux Wi-Fi à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Avancé &gt; Recherche toujours disponible."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les applications peuvent rechercher des réseaux à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Avancé &gt; Recherche toujours disponible."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ne plus afficher"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>."</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Aucune"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pour améliorer la précision de la position et à d\'autres fins, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé."\n\n"Donner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux ?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Autoriser"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Refuser"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Se connecter"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Échec de la connexion au réseau."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Retirer"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Type MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valeur MVNO"</string>
     <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>
@@ -975,7 +979,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"Localisation et recherche"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Autoriser Google à utiliser votre position pour améliorer vos résultats de recherche et autres services Google"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Accès à ma position"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Permettre aux applications ayant demandé votre autorisation d\'utiliser vos informations de localisation"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Permettre aux applis ayant demandé l\'autorisation d\'utiliser vos infos de localisation"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Sources de localisation"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"À propos de la tablette"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"À propos du téléphone"</string>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Supprimer tous les certificats"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Certificats de confiance"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Afficher les certificats d\'autorité de confiance"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dessinez votre schéma de déverrouillage."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Pour confirmer l\'installation des certificats, vous devez dessiner votre schéma de déverrouillage."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1800,11 +1810,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Application"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilisateurs"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Vous"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Autres utilisateurs"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ajouter utilisateur"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Utilis. accès limité"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Les utilisateurs en accès limité ne peuvent accéder qu\'aux applications et au contenu sélectionnés."</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Utilis. de confiance"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Les utilisateurs de confiance ne font l\'objet d\'aucune restriction."</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Actif"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Inactif"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Non configuré"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Utilisateur de confiance"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Accès limité"</string>
     <string name="user_owner" msgid="3879126011135546571">"Propriétaire"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Pseudonyme"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Ajouter un utilisateur"</string>
@@ -1827,6 +1846,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Ajout de l\'utilisateur…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Supprimer l\'utilisateur"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Supprimer"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Autoriser des applications et des contenus"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications avec restrictions"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Développer paramètres applis"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ce paramètre affecte tous les utilisateurs de cette tablette."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ce paramètre affecte tous les utilisateurs de ce téléphone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Modifier la langue"</string>
@@ -1837,4 +1859,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID de photo"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Diffusions cellulaires"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Sélectionnez les types d\'alertes d\'urgence à afficher."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Autoriser applications et contenus"</string>
+    <string name="user_rename" msgid="8523499513614655279">"RENOMMER"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Retour"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Suivant"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Terminer"</string>
 </resources>

diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index dae15b2..6ae78a9 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml

@@ -218,10 +218,12 @@
     <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="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-hi/strings.xml b/res/values-hi/strings.xml
index 4288c9f..1541627 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"स्कैनिंग हमेशा उपलब्ध है"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Google की स्थान सेवा और अन्य एप्लिकेशन को नेटवर्क खोजने दें,  Wi-Fi बंद होने पर भी"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"स्थान सटीकता को बेहतर बनाने तथा अन्य प्रयोजनों के लिए, Google और अन्य एप्लिकेशन आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही Wi-Fi बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"एप्लिकेशन आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही Wi-Fi बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"फिर से न दिखाएं"</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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> से सुरक्षित"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> से सुरक्षित"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"कोई नहीं"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान की सटीकता को बेहतर बनाने और अन्य प्रयोजनों के लिए, Wi-Fi बंद होने पर भी <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क स्कैनिंग को चालू करना चाहता है."\n\n"इसकी अनुमति उन सभी एप्लिकेशन के लिए दें जो स्कैन करना चाहते हैं?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दें"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"अस्वीकार करें"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"कनेक्‍ट करें"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"नेटवर्क से कनेक्ट करने में विफल रहा"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"भूलें"</string>
@@ -883,10 +889,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>
-    <!-- no translation found for mvno_type (2543253857818336421) -->
-    <skip />
-    <!-- no translation found for mvno_match_data (4560671695220540466) -->
-    <skip />
+    <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"सभी प्रमाणपत्र निकालें"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"विश्वस्त क्रेडेंशियल"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"विश्वस्त CA प्रमाणपत्र दिखाएं"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"अपना अनलॉक प्रतिमान आरेखित करें"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"आपको क्रेडेंशियल इंस्‍टॉलेशन की पुष्टि करने के लिए अपना अनलॉक प्रतिमान बनाना होगा."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"लागू किया जा रहा है"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"उपयोगकर्ता"</string>
     <string name="user_you_section" msgid="6247838798859425408">"आप"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"अन्य उपयोगकर्ता"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"उपयोगकर्ता जोड़ें"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"सीमित उपयोगकर्ता जोड़ें"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"सीमित उपयोगकर्ता केवल आपके द्वारा चुने गए एप्लिकेशन और सामग्री ही एक्सेस कर सकते हैं"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"विश्वसनीय उपयोगकर्ता जोड़ें"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"विश्चसनीय उयोगकर्ताओं पर कोई प्रतिबंध नहीं होता"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"सक्रिय"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"सक्रिय नहीं"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"सेट नहीं है"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"विश्वसनीय"</string>
+    <string name="user_limited" msgid="5344145255529624480">"सीमित"</string>
     <string name="user_owner" msgid="3879126011135546571">"स्वामी"</string>
     <string name="user_nickname" msgid="5148818000228994488">"प्रचलित नाम"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"नया उपयोगकर्ता जोड़ें"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"नया उपयोगकर्ता जोड़ रहा है…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"उपयोगकर्ता हटाएं"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"हटाएं"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"एप्लिकेशन और सामग्री की अनुमति दें"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंधों वाले एप्लिकेशन"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"एप्लिकेशन सेटिंग विस्तृत करें"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"यह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"यह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"भाषा बदलें"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"फ़ोटो आईडी"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"सेल प्रसारण"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"प्रदर्शित करने के लिए आपातकालीन अलर्ट के प्रकारों को चुनें."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"एप्लिकेशन और सामग्री की अनुमति दें"</string>
+    <string name="user_rename" msgid="8523499513614655279">"नाम बदलें"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"वापस जाएं"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"अगला"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"समाप्त करें"</string>
 </resources>

diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index b44e955..0335e8c 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Ništa"</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">"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 b6d0bf8..f4a1f42 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Traženje je uvijek dostupno"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Neka Googleova usluga lokacije i druge aplikacije traže mreže, čak i kada je Wi-Fi isključen"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Radi poboljšavanja preciznosti i u neke druge svrhe Google i ostale aplikacije mogu tražiti mreže u blizini, čak i kada je Wi-Fi isključen. Ako ne želite da se to događa, idite na opcije Napredno &gt; Traženje je uvijek dostupno."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacije mogu tražiti mreže u blizini, čak i kada je Wi-Fi isključen. Ako ne želite da se to događa, idite na opcije Napredno &gt; Traženje je uvijek dostupno."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ne prikazuj ponovno"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Osigurano značajkom <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", osigurano značajkom <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nema"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Radi poboljšanja preciznosti lokacije kao i u druge svrhe aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti pregledavanje mreže, čak i kada je Wi-Fi isključen."\n\n"Želite li to dozvoliti za sve aplikacije koje žele izvoditi pregledavanje?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dopusti"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Odbij"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Poveži"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Povezivanje s mrežom nije uspjelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zaboravi"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Vrsta MVNO-a"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Vrijednost MVNO-a"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Uklanjanje svih certifikata"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pouzdane vjerodajnice"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaz pouzdanih CA certifikata"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Iscrtajte obrazac za otključavanje"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Da biste potvrdili instalaciju vjerodajnica, trebate nacrtati svoj obrazac za otključavanje."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Provođenje"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Korisnici"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Vi"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Drugi korisnici"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj korisnika"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Dodaj ograničenog"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Ograničeni korisnici mogu pristupati samo aplikacijama i sadržajima koje odaberete"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Dodaj pouzdanog"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Pouzdani korisnici nemaju ograničenja"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktivan"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Nije aktivan"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nije postavljen"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Pouzdani"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Ograničeni"</string>
     <string name="user_owner" msgid="3879126011135546571">"Vlasnik"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Nadimak"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj novog korisnika"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Dodavanje novog korisnika…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Izbriši korisnika"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Izbriši"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Dopuštanje aplikacija i sadržaja"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije s ograničenjima"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Proširi postavke za aplikaciju"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ova postavka utječe na sve korisnike na ovom tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ova postavka utječe na sve korisnike na ovom telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Promjena jezika"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Poruke mobilne mreže"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Odaberite vrste hitnih obavijesti za prikaz."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Dopuštanje aplikacija i sadržaja"</string>
+    <string name="user_rename" msgid="8523499513614655279">"PREIMENOVANJE"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Natrag"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Dalje"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Završi"</string>
 </resources>

diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index dc7f01d..8903742 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Nincs"</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">"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 940c4be..066cc6f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"A keresés mindig elérhető"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"A Google helyszolgáltatása és más alkalmazások akkor is kereshetnek hálózatokat, ha a Wi-Fi ki van kapcsolva"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"A hely pontosságának javítása és egyéb célok érdekében a Google és más alkalmazások kereshetnek közeli Wi-Fi hálózatokat még akkor is, ha a Wi-Fi ki van kapcsolva. Ha nem szeretné ezt, állítsa át a Speciális &gt; A keresés mindig elérhető beállítást."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Az alkalmazások még akkor is megkereshetik a közeli hálózatokat, ha a Wi-Fi ki van kapcsolva. Ha nem szeretné ezt, állítsa át a Speciális &gt; A keresés mindig elérhető beállítást."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ne jelenjen meg többé"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> védelemmel"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> védelemmel"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nincs"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"A helymeghatározás pontosságának javítása és egyéb célok érdekében a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> szeretné engedélyezni a hálózatkeresést még kikapcsolt Wi-Fi mellett is."\n\n"Engedélyezi ezt az összes olyan alkalmazásnál, amely keresést akar végezni?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Engedélyezés"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Elutasítás"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kapcsolódás"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nem sikerült hálózathoz csatlakozni."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elfelejt"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"MVNO típus"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO érték"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Összes tanúsítvány eltávolítása"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Megbízható hitelesítő adatok"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Megbízható CA tanúsítványok megjelenítése"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Rajzolja le a feloldási mintát"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"A hitelesítési adatok telepítésének megerősítéséhez rajzolja le feloldási mintáját."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1800,11 +1810,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Kényszerítve"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Felhasználók"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Ön"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Egyéb felhasználók"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Felhasználó hozzáad."</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Korl. felhasználó"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"A korlátozott felhasználók csak az Ön által megadott alkalmazásokhoz és tartalmakhoz férnek hozzá"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Megbízható felhaszn."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"A megbízható felhasználókra nem vonatkoznak korlátozások"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktív"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Inaktív"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nincs beállítva"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Megbízható"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Korlátozott"</string>
     <string name="user_owner" msgid="3879126011135546571">"Tulajdonos"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Becenév"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Új felhasználó hozzáadása"</string>
@@ -1827,6 +1846,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Új felhasználó hozzáadása..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Felhasználó törlése"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Törlés"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Alkalmazások és tartalmak engedélyezése"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Alkalmazások korlátozásokkal"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Alkalmazásbeállítás megnyitása"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ez a beállítás minden felhasználót érint ezen a táblagépen."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ez a beállítás minden felhasználót érint ezen a telefonon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Nyelv módosítása"</string>
@@ -1837,4 +1859,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Fotóazonosító"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cellán belüli adások"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Válassza ki a megjelenítendő vészriasztások típusait."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Alkalmazások és tartalmak engedély."</string>
+    <string name="user_rename" msgid="8523499513614655279">"ÁTNEVEZÉS"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Vissza"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Tovább"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Befejezés"</string>
 </resources>

diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 3af74e9..baa34d0 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Tidak ada"</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">"Penyimpanan perangkat internal"</item>
     <item msgid="3738430123799803530">"Kartu SD yang dapat dicopot"</item>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 72c78df..af12f21 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Pemindaian selalu tersedia"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Izinkan layanan lokasi Google dan aplikasi lain memindai jaringan, bahkan saat Wi-Fi tidak aktif"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Untuk meningkatkan keakuratan lokasi dan untuk tujuan lainnya, Google dan aplikasi lainnya dapat memindai jaringan terdekat, bahkan saat Wi-Fi mati. Jika Anda tidak ingin ini terjadi, buka Lanjutan &gt; Pemindaian selalu tersedia."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikasi dapat memindai jaringan terdekat, bahkan saat Wi-Fi mati. Jika Anda tidak ingin ini terjadi, buka Lanjutan &gt; Pemindaian selalu tersedia."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Jangan tampilkan lagi"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Diamankan dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", diamankan dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Tidak Ada"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk meningkatkan ketepatan lokasi dan untuk tujuan lainnya, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan pemindaian jaringan, bahkan saat Wi-Fi sedang tidak aktif."\n\n"Izinkan ini untuk semua aplikasi yang ingin memindai?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Izinkan"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Tolak"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Sambungkan"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke jaringan"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Jenis MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Nilai MVNO"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Hapus semua sertifikat"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Kredensial tepercaya"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Tampilkan sertifikat CA tepercaya"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Gambar pola pembuka kunci Anda"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu menggambar pola pembuka kunci untuk mengonfirmasi instalasi kredensial."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1754,8 +1764,8 @@
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Sertifikat server IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Tampilkan opsi lanjutan"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domain penelusuran DNS"</string>
-    <string name="vpn_dns_servers" msgid="5570715561245741829">"Server DNS (mis. 8.8.8.8)"</string>
-    <string name="vpn_routes" msgid="3818655448226312232">"Rute penerusan (mis. 10.0.0.0/8)"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Server DNS (misal: 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Rute penerusan (misal: 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"Nama pengguna"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Sandi"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Simpan informasi akun"</string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Wajib"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Anda"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Pengguna lainnya"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Tambahkan pengguna"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Tmbh pengguna terbts"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Pengguna terbatas hanya dapat mengakses aplikasi dan konten yang Anda pilih"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Tmbh pengguna tprcaya"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Pengguna tepercaya tidak dibatasi"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktif"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Tidak aktif"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Tidak disiapkan"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Tepercaya"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Terbatas"</string>
     <string name="user_owner" msgid="3879126011135546571">"Pemilik"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Nama julukan"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Tambahkan pengguna baru"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Menambahkan pengguna baru..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Hapus pengguna"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Hapus"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Izinkan aplikasi dan konten"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan batasan"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Luaskan setelan untuk aplikasi"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Setelan ini memengaruhi semua pengguna di tablet ini."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Setelan ini memengaruhi semua pengguna di ponsel ini."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Ubah bahasa"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID Foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Siaran sel"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pilih jenis peringatan darurat yang akan ditampilkan."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Izinkan aplikasi dan konten"</string>
+    <string name="user_rename" msgid="8523499513614655279">"UBAH NAMA"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Kembali"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Berikutnya"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Selesai"</string>
 </resources>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b918d99..2df057f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -542,6 +542,11 @@
     <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>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
+    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Per una maggiore precisione nella localizzazione e altri motivi, Google e altre app sono in grado di cercare reti nelle vicinanze, anche quando la connessione Wi-Fi è disattivata. Se non desideri consentire tale ricerca, accedi ad Avanzate &gt; Scansione sempre disponibile."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Le app possono cercare reti nelle vicinanze, anche quando la connessione Wi-Fi è disattivata. Se non desideri consentire tale ricerca, accedi ad Advanzate &gt; Scansione sempre disponibile."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Non·mostrare·più"</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>
@@ -603,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protetta con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protetta con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nessuna"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per migliorare la precisione della posizione e per altri scopi, <xliff:g id="APP_NAME">%1$s</xliff:g> chiede di attivare la ricerca della rete, anche quando il Wi-Fi è disattivato."\n\n"Consetirlo a tutte le app che vogliono eseguire la ricerca?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Consenti"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Rifiuta"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connetti"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Impossibile connettersi alla rete"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elimina"</string>
@@ -1486,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Rimuovi tutti i certificati"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenziali attendibili"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Visualizza certificati CA attendibili"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Inserisci la sequenza di sblocco"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Per confermare l\'installazione delle credenziali devi inserire la sequenza di sblocco."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1794,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Applicazione"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utenti"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Tu"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Altri utenti"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Aggiungi utente"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Agg. utente con restriz."</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Gli utenti con restrizioni possono accedere solo alle app e ai contenuti selezionati"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Utente trusted"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Gli utenti trusted non sono soggetti a limitazioni"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Attivo"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Non attivo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Non configurato"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Trusted"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Con restrizioni"</string>
     <string name="user_owner" msgid="3879126011135546571">"Proprietario"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Nickname"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Aggiungi nuovo utente"</string>
@@ -1821,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Aggiunta nuovo utente…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Elimina utente"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Elimina"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Consenti app e contenuti"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applicazioni con limitazioni"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Espandi impostazioni per app"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Questa impostazione influisce su tutti gli utenti di questo tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Questa impostazione influisce su tutti gli utenti di questo telefono."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambia lingua"</string>
@@ -1831,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcast"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Seleziona i tipi di avvisi di emergenza da visualizzare."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Consenti app e contenuti"</string>
+    <string name="user_rename" msgid="8523499513614655279">"RINOMINA"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Indietro"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Avanti"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Fine"</string>
 </resources>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 743e12d..d2ced02 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -542,6 +542,11 @@
     <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>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
+    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"כדי לשפר את מידת הדיוק מבחינת מיקום ולהשגת יתרונות נוספים, יישומים של Google ויישומים נוספים עשויים לבצע סריקה לאיתור רשתות קרובות, גם כאשר ה-Wi-Fi כבוי. אם אינך מעוניין בכך, עבור אל \'מתקדם\' &gt; \'סריקה זמינה תמיד\'."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"יישומים עשויים לבצע סריקה לאיתור רשתות קרובות, גם אם ה-Wi-Fi כבוי. אם אינך מעוניין בכך, עבור אל \'מתקדם\' &gt; \'סריקה זמינה תמיד\'."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"אל תציג שוב"</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>
@@ -603,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"ללא"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"לשיפור דיוק המיקום ולמטרות אחרות, <xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל את סריקת הרשתות, גם כאשר ה-Wi-Fi כבוי."\n\n"האם להתיר זאת עבור כל היישומים שרוצים לסרוק?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"אפשר"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"דחה"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"התחבר"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"נכשל הניסיון להתחבר לרשת"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"שכח"</string>
@@ -1486,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"הסר את כל האישורים"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"אישורים מהימנים"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"הצג אישורי CA מהימנים"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"שרטט את קו ביטול הנעילה"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"עליך לשרטט את קו ביטול הנעילה כדי לאשר התקנת הסמכות."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1794,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"אכיפה"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"משתמשים"</string>
     <string name="user_you_section" msgid="6247838798859425408">"אתה"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"משתמשים אחרים"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"הוסף משתמש"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"הוסף משתמש מוגבל"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"משתמשים מוגבלים יכולים לגשת רק ליישומים ולתוכן שאתה בחרת"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"הוסף משתמש מהימן"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"על משתמשים מהימנים לא חלות הגבלות"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"פעיל"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"לא פעיל"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"לא מוגדר"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"מהימן"</string>
+    <string name="user_limited" msgid="5344145255529624480">"מוגבל"</string>
     <string name="user_owner" msgid="3879126011135546571">"בעלים"</string>
     <string name="user_nickname" msgid="5148818000228994488">"כינוי"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"הוסף משתמש חדש"</string>
@@ -1821,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"מוסיף משתמשים חדשים…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"מחק משתמש"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"מחק"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"אפשר יישומים ותוכן"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"יישומים והגבלות"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"הרחב את ההגדרות עבור היישום"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"הגדרה זו משפיעה על כל המשתמשים בטאבלט הזה."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"הגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"שנה שפה"</string>
@@ -1831,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"זיהוי תמונה"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"שידורים סלולריים"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"בחר את סוגי התראות החירום להצגה."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"אפשר יישומים ותוכן"</string>
+    <string name="user_rename" msgid="8523499513614655279">"שנה שם"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"הקודם"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"הבא"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"סיום"</string>
 </resources>

diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index f9ad5c3..21f877d 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml

@@ -218,10 +218,12 @@
     <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="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-ja/strings.xml b/res/values-ja/strings.xml
index 8236598..44cb6f4 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -542,10 +542,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"常にスキャンが行われるようにする"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Wi-FiがOFFになっていても、Googleの位置情報サービスと他のアプリでネットワークをスキャンします"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"位置情報の精度を向上させるため、Wi-FiがOFFの場合でもGoogleやその他のアプリは近くのネットワークをスキャンすることができます。このスキャンが必要ない場合は、[詳細設定] &gt; [常にスキャン] にアクセスします。"</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-FiがOFFの場合でもアプリは近くのネットワークをスキャンできます。このスキャンが必要ない場合は、[詳細設定] &gt; [常にスキャン]にアクセスします。"</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"次回から表示しない"</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>
@@ -607,6 +610,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"、<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"なし"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"現在地情報の精度向上やその他の目的で、<xliff:g id="APP_NAME">%1$s</xliff:g>ではWi-Fiがオフのときでもネットワークスキャンをオンにすることをおすすめしています。"\n\n"スキャンを必要とするすべてのアプリでスキャンを許可しますか？"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"許可する"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"許可しない"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"接続"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ネットワークに接続できませんでした"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"切断"</string>
@@ -885,10 +891,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>
-    <!-- no translation found for mvno_type (2543253857818336421) -->
-    <skip />
-    <!-- no translation found for mvno_match_data (4560671695220540466) -->
-    <skip />
+    <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>
@@ -1496,6 +1500,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"証明書をすべて削除する"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"信頼できる認証情報"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"信頼できるCA証明書を表示する"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ロック解除パターンを入力してください"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"認証情報をインストールするには、ロック解除パターンを入力する必要があります。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1804,11 +1814,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"ユーザー"</string>
     <string name="user_you_section" msgid="6247838798859425408">"自分"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"その他のユーザー"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"ユーザーを追加"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"限定ユーザーを追加"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"限定ユーザーのみがアプリとコンテンツにアクセスできる"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"信頼できるユーザーを追加"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"信頼できるユーザーに権限がありません"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"有効"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"無効"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"セットアップしていません"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"信頼できる"</string>
+    <string name="user_limited" msgid="5344145255529624480">"限定"</string>
     <string name="user_owner" msgid="3879126011135546571">"所有者"</string>
     <string name="user_nickname" msgid="5148818000228994488">"ニックネーム"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"新しいユーザーを追加する"</string>
@@ -1831,6 +1850,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"新しいユーザーを追加中…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"ユーザーを削除"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"削除"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"アプリとコンテンツの許可"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"制限のあるアプリ"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"アプリの設定を展開"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"この設定はこのタブレット上のすべてのユーザーに影響します。"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"この設定はこの端末上のすべてのユーザーに影響します。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"言語の変更"</string>
@@ -1841,4 +1863,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"画像ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"緊急警報"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"表示する緊急警報の種類を選択してください。"</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"アプリとコンテンツの許可"</string>
+    <string name="user_rename" msgid="8523499513614655279">"名前を変更"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"戻る"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"次へ"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"終了"</string>
 </resources>

diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 672ffc5..ab1d5f8 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml

@@ -218,10 +218,12 @@
     <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="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-ko/strings.xml b/res/values-ko/strings.xml
index 420d8fb..e9687e3 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"네트워크 항상 검색"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Wi-Fi가 껴져 있을 때에도 Google의 위치 서비스 및 기타 앱이 네트워크를 검색하도록 합니다."</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"정확성 개선 등의 목적으로 Google 및 기타 앱이 근처 Wi-Fi 네트워크를 스캔할 수 있습니다. Wi-Fi가 꺼져 있을 때도 작동합니다. 이 기능을 사용하지 않으려면 고급 &gt; 항상 스캔 허용으로 이동하세요."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"앱이 Wi-Fi가 꺼져 있을 때도 근처 네트워크를 스캔할 수 있습니다. 이 기능을 사용하지 않으려면 고급 &gt; 항상 스캔 허용으로 이동하세요."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"다시 표시 안함"</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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>(으)로 보안"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>(으)로 보안"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"없음"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"위치 정확성 개선 등의 목적으로 <xliff:g id="APP_NAME">%1$s</xliff:g>에서 Wi-Fi가 꺼져 있을 때에도 네트워크 검색을 사용하도록 설정하려 합니다."\n\n"검색하려는 모든 앱에 대해 이를 허용하시겠습니까?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"허용"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"거부"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"연결"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"네트워크 연결 실패"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"저장 안함"</string>
@@ -883,10 +889,8 @@
     <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="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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"모든 인증서 삭제"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"신뢰할 수 있는 자격증명"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"신뢰할 수 있는 CA 인증서 표시"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"잠금해제 패턴을 그리세요."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"자격증명 설치를 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"시행"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"사용자"</string>
     <string name="user_you_section" msgid="6247838798859425408">"나"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"다른 사용자"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"사용자 추가"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"제한된 사용자 추가"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"제한된 사용자만 내가 선택한 앱과 콘텐츠에 액세스할 수 있습니다."</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"신뢰할 수 있는 사용자 추가"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"신뢰할 수 있는 사용자는 제한이 없습니다."</string>
     <string name="user_summary_active" msgid="4740649452346004418">"활성"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"비활성"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"설정되지 않음"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"신뢰할 수 있는 사용자"</string>
+    <string name="user_limited" msgid="5344145255529624480">"제한된 사용자"</string>
     <string name="user_owner" msgid="3879126011135546571">"소유자"</string>
     <string name="user_nickname" msgid="5148818000228994488">"닉네임"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"새 사용자 추가"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"새 사용자 추가 중..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"사용자 삭제"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"삭제"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"앱 및 콘텐츠 허용"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"애플리케이션 제한"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"애플리케이션을 위한 설정 확장"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"이 설정은 태블릿의 모든 사용자에게 영향을 줍니다."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"이 설정은 휴대전화의 모든 사용자에게 영향을 줍니다."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"언어 변경"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"사진 ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"셀 브로드캐스트"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"표시할 긴급 알림 유형을 선택합니다."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"앱 및 콘텐츠 허용"</string>
+    <string name="user_rename" msgid="8523499513614655279">"이름 바꾸기"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"뒤로"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"다음"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"완료"</string>
 </resources>

diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 4c1ee7a..2fde167 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Jokių"</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">"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 ba825d5..0dd3fc1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Nuskaitymas visada pasiekiamas"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Leisti „Google“ vietovių paslaugai ir kitoms programoms nuskaityti tinklus, net kai „Wi-Fi“ išjungtas"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Kad patobulintumėte vietovių tikslumą ir kitais tikslais, leiskite „Google“ vietovių paslaugai ir kitoms programoms ieškoti netoliese esančių „Wi-Fi“ tinklų, net jei „Wi-Fi“ išjungtas. Jei nenorite, kad būtų ieškoma, eikite į skiltį „Išplėstiniai“ &gt; „Visada galima ieškoti“."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Programos gali ieškoti netoliese esančių tinklų, net kai „Wi-Fi“ yra išjungtas. Jei nenorite, kad būtų ieškoma, eikite į skiltį „Išplėstiniai“ &gt; „Visada galima ieškoti“."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Daugiau neberodyti"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Saugoma „<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>“"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", saugoma „<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>“"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nėra"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Siekiant tiksliau nustatyti vietą ir dėl kitų priežasčių, „<xliff:g id="APP_NAME">%1$s</xliff:g>“ prašo leidimo nuskaityti tinklus, net kai „Wi-Fi“ yra išjungtas."\n\n"Ar norite suteikti leidimą nuskaityti visoms to prašančioms programoms?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Leisti"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Atmesti"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Prijungti"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Jungiantis prie tinklo įvyko klaida."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pamiršti"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"MVNO tipas"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO vertė"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Pašalinti visus sertifikatus"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Patikimi įgaliojimai"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Rodyti patikimus CA sertifikatus"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Nubrėžti atrakinimo piešinį"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kad patvirtintumėte kredencialų diegimą, turite nubrėžti atrakinimo piešinį."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Vykdoma"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Naudotojai"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Jūs"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Kiti naudotojai"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Pridėti naudotoją"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Pridėti apr. naudot."</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Apriboti naudotojai gali pasiekti tik jūsų pasirinktas programas ir turinį"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Prid. patik. naudot."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Patikimiems naudotojams netaikomi apribojimai"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktyvus"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktyvus"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nenustatyta"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Patikimas"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Apribotas"</string>
     <string name="user_owner" msgid="3879126011135546571">"Savininkas"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Slapyvardis"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Pridėti naują naudotoją"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Pridedamas naujas naudotojas…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Ištrinti naudotoją"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Ištrinti"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Leisti programas ir turinį"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programos su apribojimais"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Išplėsti programos nustatymus"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Šis nustatymas turi įtakos visiems šio planšetinio kompiuterio naudotojams."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Šis nustatymas turi įtakos visiems šio telefono naudotojams."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Keisti kalbą"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Nuotraukos ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Tinklo transliacijos"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pasirinkite rodomų nepaprastųjų įspėjimų tipus."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Leisti programas ir turinį"</string>
+    <string name="user_rename" msgid="8523499513614655279">"PERVARDYTI"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Atgal"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Kitas"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Užbaigti"</string>
 </resources>

diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 62ea740..444871e 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml

@@ -218,10 +218,12 @@
     <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="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">"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 3dfb1f5..15f088f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Meklēšana vienmēr pieejama"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Atļaut Google atrašanās vietas pakalpojumam un citām lietotnēm meklēt tīklus, pat ja Wi-Fi savienojums ir izslēgts"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Atrašanās vietas noteikšanas precizitātes uzlabošanai un citiem nolūkiem Google un citas lietotnes var meklēt tuvumā esošos tīklus pat tad, kad Wi-Fi ir izslēgts. Ja to nevēlaties, atveriet Papildu &gt; Meklēšana vienmēr pieejama."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Lietotnes var meklēt tuvumā esošos tīklus pat tad, kad Wi-Fi ir izslēgts. Ja to nevēlaties, atveriet Papildu &gt; Meklēšana vienmēr pieejama."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Vairs nerādīt"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Nodrošināts ar <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", nodrošināts ar <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nav"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Lai uzlabotu atrašanās vietu noteikšanas precizitāti, kā arī citas funkcijas, lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g> tiek pieprasīts ieslēgt tīkla skenēšanu, pat ja Wi-Fi savienojums ir izslēgts."\n\n"Vai atļaut šo darbību visām lietotnēm, kurās tiek pieprasīta skenēšana?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Atļaut"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Noraidīt"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Izveidot savienojumu"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Neizdevās izveidot savienojumu ar tīklu."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Neiegaumēt"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"MVNO veids"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO vērtība"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Noņemt visus sertifikātus"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Uzticami akreditācijas dati"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Attēlot uzticamus CA sertifikātus"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Norādiet atbloķēšanas kombināciju."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Lai apstiprinātu akreditācijas datu instalēšanu, norādiet atbloķēšanas kombināciju."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Īstenots"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Lietotāji"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Informācija par jums"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Citi lietotāji"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Pievienot lietotāju"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Piev. ierobež. liet."</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Lietotāji ar ierobežotu piekļuvi var piekļūt tikai jūsu atlasītajām lietotnēm un saturam."</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Piev. uztic. lietot."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Uzticamajiem lietotājiem nav ierobežojumu."</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktīvs"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktīvs"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nav iestatīts"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Uzticams"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Ierobežots"</string>
     <string name="user_owner" msgid="3879126011135546571">"Īpašnieks"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Segvārds"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Lietotāja pievienošana"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Jauna lietotāja pievienošana…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Dzēst lietotāju"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Dzēst"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Lietotņu un satura atļaušana"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Lietojumprogrammas ar ierobežojumiem"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Izvērst lietojumprogr. iestat."</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Šis iestatījums ietekmē visus šī planšetdatora lietotājus."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Šis iestatījums ietekmē visus šī tālruņa lietotājus."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Valodas maiņa"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Dokuments ar foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Šūnu apraides"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Atlasiet rādāmos ārkārtas situāciju brīdinājumus."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Lietotņu un satura atļaušana"</string>
+    <string name="user_rename" msgid="8523499513614655279">"PĀRDĒVĒT"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Atpakaļ"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Tālāk"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Pabeigt"</string>
 </resources>

diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 97fddbe..82d4837 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Tiada"</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">"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 37558f9..9e011ea 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Imbasan sentiasa tersedia"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Benarkan perkhidmatan lokasi Google dan apl lain mengimbas rangkaian, walaupun semasa Wi-Fi dimatikan"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Untuk memperbaik ketepatan lokasi dan untuk tujuan lain, Google dan apl lain mungkin mengimbas rangkaian berhampiran walaupun semasa Wi-Fi dimatikan. Jika anda tidak mahu ini berlaku, pergi ke Terperinci &gt; Pengimbasan sentiasa tersedia."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apl mungkin mengimbas rangkaian berhampiran, walaupun semasa Wi-Fi dimatikan. Jika anda tidak mahu ini berlaku, pergi ke Terperinci &gt; Pengimbasan sentiasa tersedia."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Jangan tunjukkan lagi"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Dijamin dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", dijamin dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Tiada"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk memperbaik ketepatan lokasi dan untuk tujuan lain, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin menghidupkan imbasan rangkaian, walaupun semasa Wi-Fi dimatikan."\n\n"Benarkan fungsi ini untuk semua apl yang ingin mengimbas?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Benarkan"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Tolak"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Sambung"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke rangkaian."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Jenis MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Nilai MVNO"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alih keluar semua sijil"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Bukti kelayakan dipercayai"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Paparkan sijil CA yang dipercayai"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Lukis corak buka kunci anda"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu melukiskan corak buka kunci anda untuk mengesahkan pemasangan bukti kelayakan."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Menguatkuasakan"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Anda"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Pengguna lain"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Tambah pengguna"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Tmbh pengguna terhad"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Pengguna terhad hanya boleh mengakses apl dan kandungan yang anda pilih"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Tmbh pguna dpercayai"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Pengguna dipercayai tidak mempunyai sekatan"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktif"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Tidak aktif"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Tidak disediakan"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Dipercayai"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Terhad"</string>
     <string name="user_owner" msgid="3879126011135546571">"Pemilik"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Nama samaran"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Tambah pengguna baharu"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Menambah pengguna baharu..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Padam pengguna"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Padam"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Benarkan apl dan kandungan"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan sekatan"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Kembangkn tetapan utk aplikasi"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Tetapan ini melibatkan semua pengguna pada tablet ini."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tetapan ini melibatkan semua pengguna pada telefon ini."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Tukar bahasa"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID Berfoto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Siaran sel"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pilih jenis amaran kecemasan untuk dipaparkan."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Benarkan apl dan kandungan"</string>
+    <string name="user_rename" msgid="8523499513614655279">"NAMAKAN SEMULA"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Kembali"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Seterusnya"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Selesai"</string>
 </resources>

diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 6395a89..0a2c15e 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Ingen"</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">"Intern lagringsenhet"</item>
     <item msgid="3738430123799803530">"Flyttbart minnekort"</item>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 605474f..eac445b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Skanning er alltid tilgjengelig"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Tillat at Googles posisjonstjeneste og andre apper skanner etter nettverk, selv når Wi-Fi er slått av"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"For å forbedre posisjonsnøyaktigheten, og for andre formål, kan Google og andre apper søke etter nettverk i nærheten, selv når Wi-Fi er slått av. Hvis du ikke vil at dette skal skje, går du til Avansert &gt; Skanning alltid tilgjengelig."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apper kan søke etter nettverk i nærheten, selv når Wi-Fi er slått av. Hvis du ikke vil at dette skal skje, går du til Avansert &gt; Skanning alltid tilgjengelig."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ikke vis igjen"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å bruke nettverksskanning, også når Wi-Fi er slått av, for bedre posisjonsnøyaktighet og andre formål. "\n\n"Vil du tillate dette for alle apper som prøver å skanne?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillat"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Avvis"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koble til"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Kan ikke koble til nettverket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Slett"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"MVNO-type"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-verdi"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Fjern alle sertifikater"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pålitelig legitimasjon"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vis pålitelige CA-sertifikater"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Tegn opplåsingsmønsteret"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du må tegne opplåsingsmønsteret for å bekrefte installasjonen av legitimasjon."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1515,7 +1525,7 @@
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Sikkerhetskopikonto"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ingen konto lagrer for øyeblikket sikkerhetskopierte data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Auto-gjenoppretting"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"Når du installerer en app, bør du gjenopprette sikkerhetskopierte innstillinger og data"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"Gjenopprett sikkerhetskopierte innstillinger og data når apper installeres"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Passord for sikkerhetskopiering på datamaskin"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Fullstendig sikkerhetskopiering på datamaskin beskyttes ikke for øyeblikket."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Trykk for å endre eller fjerne passordet for fullstendige sikkerhetskopier på datamaskinen"</string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Håndhevende"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Brukere"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Deg"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Andre brukere"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Legg til bruker"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Legg til begrenset bruker"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Begrensede brukere får bare tilgang til appene og innholdet du velger ut"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Legg til pålitelig bruker"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Pålitelige brukere har ingen begrensninger"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktiv"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Ikke aktiv"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ikke konfigurert"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Pålitelig"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Begrenset"</string>
     <string name="user_owner" msgid="3879126011135546571">"Eier"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Kallenavn"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Legg til ny bruker"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Legger til ny bruker …"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Slett bruker"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Slett"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Tillat apper og innhold"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apper med begrensninger"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Utvidelsesinnstillinger for appen"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Denne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne innstillingen påvirker alle brukerne på denne telefonen."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Bytt språk"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Kringkastede meldinger"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Velg hvilke nødvarsler som skal vises."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Tillat apper og innhold"</string>
+    <string name="user_rename" msgid="8523499513614655279">"GI NYTT NAVN"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Tilbake"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Neste"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Fullfør"</string>
 </resources>

diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 4f64983..320a2a1 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Geen"</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">"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 1106e09..f535363 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scannen altijd beschikbaar"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"De locatieservice en andere apps van Google laten scannen naar netwerken, zelfs wanneer wifi is uitgeschakeld"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Als u de nauwkeurigheid van locaties en voor andere doeleinden wilt verbeteren, kunnen Google en andere apps scannen naar netwerken in de buurt, zelfs wanneer wifi is uitgeschakeld. Als u niet wilt dat dit gebeurt, gaat u naar \'Geavanceerd\' &gt; \'Scannen altijd beschikbaar\'."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps kunnen scannen naar netwerken in de buurt, zelfs wanneer wifi is uitgeschakeld. Als u niet wilt dat dit gebeurt, gaat u naar \'Geavanceerd\' &gt; \'Scannen altijd beschikbaar\'."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Niet opnieuw weergeven"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Beveiligd met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveiligd met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om de locatieprecisie te verbeteren en voor andere doeleinden, wil <xliff:g id="APP_NAME">%1$s</xliff:g> de netwerkscan inschakelen, zelfs als wifi is uitgeschakeld."\n\n"Dit toestaan voor alle apps die willen scannen?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Toestaan"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Afwijzen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Kan geen verbinding maken met het netwerk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeten"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"MVNO-type"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-waarde"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alle certificaten verwijderen"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertrouwde id-gegevens"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrouwde CA-certificaten weergeven"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teken uw ontgrendelingspatroon"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"U moet uw ontgrendelingspatroon tekenen om de identificatie-installatie te bevestigen."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing (Wordt afgedwongen)"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Gebruikers"</string>
     <string name="user_you_section" msgid="6247838798859425408">"U"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Andere gebruikers"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Gebruiker toevoegen"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Beperkte gebr. toev."</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Beperkte gebruikers kunnen alleen de apps en content openen die u selecteert"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Betrouwb. gebr. toev."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Betrouwbare gebruikers hebben geen beperkingen"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Actief"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Niet actief"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Niet ingesteld"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Betrouwbaar"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Beperkt"</string>
     <string name="user_owner" msgid="3879126011135546571">"Eigenaar"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Bijnaam"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Nieuwe gebruiker toevoegen"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Nieuwe gebruiker toevoegen…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Gebruiker verwijderen"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Verwijderen"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Apps en inhoud toestaan"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps met beperkingen"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Inst. uitbreiden voor app"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Deze instelling is van invloed op alle gebruikers van deze tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Deze instelling is van invloed op alle gebruikers van deze telefoon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Taal wijzigen"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcasts"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecteer de typen noodoproepen die moeten worden weergegeven."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Apps en inhoud toestaan"</string>
+    <string name="user_rename" msgid="8523499513614655279">"NAAM WIJZIGEN"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Terug"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Volgende"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Voltooien"</string>
 </resources>

diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 89c456f..1a10173 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml

@@ -218,10 +218,12 @@
     <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="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">"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 e4e9ec6..4b084d5 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Skanowanie zawsze dostępne"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Pozwól usłudze lokalizacji Google i innym aplikacjom skanować w poszukiwaniu sieci, nawet gdy sieć Wi-Fi jest wyłączona"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Aby poprawić dokładność (i w innych celach), aplikacje Google i inne mogą skanować sieci w pobliżu, nawet gdy Wi-Fi jest wyłączone. Jeśli nie chcesz, aby tak się działo, wybierz Zaawansowane &gt; Skanowanie zawsze dostępne."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacje mogą wyszukiwać sieci w pobliżu, nawet gdy Wi-Fi jest wyłączone. Jeśli nie chcesz, aby tak się działo, wybierz Zaawansowane &gt; Skanowanie zawsze dostępne."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Nie pokazuj ponownie"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Brak"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aby poprawić rozpoznawanie lokalizacji i korzystać z innych funkcji, <xliff:g id="APP_NAME">%1$s</xliff:g> chce włączyć skanowanie sieci – nawet kiedy obsługa Wi-Fi jest wyłączona."\n\n"Zezwolić na to wszystkim aplikacjom, które chcą przeprowadzać skanowanie?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zezwól"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Odrzuć"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Połącz"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nie można nawiązać połączenia z siecią"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zapomnij"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Typ MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Wartość MVNO"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Usuń wszystkie certyfikaty"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Zaufane dane uwierzytelniające"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Wyświetlanie zaufanych certyfikatów CA"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Narysuj wzór odblokowania"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Aby potwierdzić instalację danych logowania, musisz narysować wzór odblokowania."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Restrykcyjny"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Użytkownicy"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Ty"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Inni użytkownicy"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj użytkownika"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Dodaj użytk. z ogr."</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Użytkownicy z ograniczeniami mają dostęp tylko do treści i aplikacji wybranych przez Ciebie"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Dodaj zaufan. użytk."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Zaufani użytkownicy nie są objęci żadnymi ograniczeniami"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktywny"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Nieaktywny"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nieskonfigurowany"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Zaufany"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Z ograniczeniami"</string>
     <string name="user_owner" msgid="3879126011135546571">"Właściciel"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Pseudonim"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj nowego użytkownika"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Dodaję nowego użytkownika…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Usuń użytkownika"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Usuń"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Zezwól na aplikacje i zawartość"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacje z ograniczeniami"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozwiń ustawienia aplikacji"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"To ustawienie obowiązuje wszystkich użytkowników tego tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"To ustawienie obowiązuje wszystkich użytkowników tego telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Zmień język"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Identyfikator zdjęcia"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmisje komórkowe"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Wybierz typy alertów o zagrożeniu, które chcesz wyświetlić."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Zezwól na aplikacje i zawartość"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ZMIEŃ NAZWĘ"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Wróć"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Dalej"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Zakończ"</string>
 </resources>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index c0e75ba..950d099 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -542,6 +542,11 @@
     <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>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
+    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para melhorar a precisão de localização e para outros fins, a Google e outras aplicações poderão procurar redes nas proximidades, mesmo com o Wi-Fi desligado. Se não pretender que isto aconteça, aceda a Avançadas &gt; Procura sempre disponível."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"As aplicações poderão procurar redes nas proximidades, mesmo com o Wi-Fi desligado. Se não pretender que isto aconteça, aceda a Avançadas &gt; Procura sempre disponível."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Não mostrar de novo"</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>
@@ -603,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para melhorar a precisão da localização e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> pretende ativar a verificação de redes, mesmo quando o Wi-Fi está desativado."\n\n"Permitir esta opção para todas as aplicações que pretenderem verificar?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Recusar"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ligar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Não foi possível estabelecer ligação à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
@@ -963,15 +971,15 @@
     <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>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"Permita que as aplicações utilizem o GPS do telemóvel para localizar a sua posição"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permitir que as aplicações utilizem o GPS do tablet para localizar a sua posição"</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"Permitir que as aplicações utilizem o GPS do telemóvel p/ determinar a sua posição"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS assistido"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar o servidor para auxiliar o GPS (desmarque esta opção para reduzir a utilização da rede)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar o servidor para auxiliar o GPS (desmarque esta opção para melhorar o desempenho do GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Localização e pesquisa do Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Permitir que o Google utilize a sua localização para melhorar os resultados da pesquisa e os outros serviços"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"Acesso à minha localização"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Permita que as aplicações que tenham solicitado a sua permissão utilizem informações sobre a sua localização"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"Acesso à localização"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Permitir que aplic. com permissão utilizem informações sobre a sua localização"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Origens da localização"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Acerca do tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Acerca do telefone"</string>
@@ -1486,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenciais fiáveis"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados da AC fiáveis"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenhe a sua sequência de desbloqueio"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário desenhar a sequência de desbloqueio para confirmar a instalação de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1794,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Forçador"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizadores"</string>
     <string name="user_you_section" msgid="6247838798859425408">"O utilizador"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Outros utilizadores"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar utilizador"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Adic. utiliz. limit."</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Os utilizadores limitados apenas podem aceder às aplicações e conteúdos selecionados"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Adic. utiliz. fided."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Os utilizadores fidedignos não têm restrições"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Ativo"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Não ativo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Não configurado"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Fidedigno"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Limitado"</string>
     <string name="user_owner" msgid="3879126011135546571">"Proprietário"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Pseudónimo"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Adicionar novo utilizador"</string>
@@ -1821,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"A adicionar novo utilizador..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Eliminar utilizador"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Eliminar"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicações e conteúdo"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicações com restrições"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir defin. da aplicação"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta definição afeta todos os utilizadores deste tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta definição afeta todos os utilizadores deste telemóvel."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string>
@@ -1831,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID da fotografia"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmissões celulares"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecione os tipos de alertas de emergência a apresentar."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Permitir aplicações e conteúdo"</string>
+    <string name="user_rename" msgid="8523499513614655279">"MUDAR NOME"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Anterior"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Seguinte"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Terminar"</string>
 </resources>

diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index da24df8..684b86b 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml

@@ -218,10 +218,12 @@
     <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="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">"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 70cd12f..73f2b4f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -317,8 +317,8 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptografia"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptografar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptografar telefone"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Solicite um PIN ou uma senha numérica para decodificar seu tablet sempre que o ligar"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Solicite um PIN ou senha numérica para decodificar seu telefone sempre que o ligar"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Exigir um PIN numérico ou uma senha para decodificar seu tablet sempre que ligá-lo"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Exigir um PIN numérico ou senha para decodificar seu telefone sempre que ligá-lo"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptografado"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Após criptografar seu tablet, será necessário digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu tablet, exceto se realizar uma redefinição para configuração original, apagando todos os seus dados."\n\n"A criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu tablet conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Após criptografar seu telefone, será necessário digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu telefone, exceto se realizar uma redefinição para configuração original, apagando todos os seus dados."\n\n"A criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu telefone conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Verificação sempre disponível"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Permitir que o serviço de localização do Google e outros aplicativos verifiquem redes, mesmo que o Wi-Fi esteja desligado"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para aumentar a precisão da localização e para outras finalidades, o Google e outros aplicativos podem verificar redes próximas, mesmo que o Wi-Fi esteja desligado. Para impedir, vá para \"Avançado &gt; Verificação sempre disponível\"."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Os aplicativos podem verificar redes Wi-Fi próximas, mesmo que o Wi-Fi esteja desligado. Para impedir, vá para \"Avançado &gt; Verificação sempre disponível\"."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Não mostrar novamente"</string>
     <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>
@@ -599,12 +602,15 @@
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Conexão com a Internet de baixa qualidade evitada"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticação"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Não está dentro do alcance"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora do alcance"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para aumentar a precisão da localização e outras finalidades, <xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar a verificação de rede, mesmo que o Wi-Fi esteja desligado."\n\n"Permitir isto para todos os aplicativos que quiserem verificar?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Negar"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Falha ao conectar à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
@@ -883,10 +889,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>
-    <!-- no translation found for mvno_type (2543253857818336421) -->
-    <skip />
-    <!-- no translation found for mvno_match_data (4560671695220540466) -->
-    <skip />
+    <string name="mvno_type" msgid="2543253857818336421">"Tipo de MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valor de MVNO"</string>
     <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>
@@ -974,8 +978,8 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Usar servidor para auxiliar GPS (desmarque para aprimorar o desempenho do GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Local. e pesq. do Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Permitir que o Google use sua localização para melhorar os resultados de pesquisa e outros serviços"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"Acesso a minha localização"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Permitir que os aplicativos que solicitaram sua permissão usem seus dados de localização"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"Acesso à localização"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Permitir a aplicativos que solicitaram permissão usem seus dados de local"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Fontes de localização"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Sobre o tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Sobre o telefone"</string>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenciais confiáveis"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados CA de confiança"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenhe seu padrão de desbloqueio"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário que você desenhe seu padrão de desbloqueio para confirmar a instalação de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Impondo"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Usuários"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Você"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Outros usuários"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar usuário"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Ad. usuário limitado"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Usuários limitados podem acessar somente os aplicativos e o conteúdo selecionado por você"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Ad. usuár. confiável"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Usuários confiáveis não têm restrições"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Ativo"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Inativo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Não configurado"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Confiável"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Limitado"</string>
     <string name="user_owner" msgid="3879126011135546571">"Proprietário"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Apelido"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Adicionar novo usuário"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Adicionando novo usuário..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Excluir usuário"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Excluir"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicativos e conteúdo"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicativos com restrições"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir config. p/ aplicativo"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuração afeta todos os usuários do tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuração afeta todos os usuários do telefone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmissões por celular"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecione os tipos de alertas de emergência a exibir."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Permitir aplicativos e conteúdo"</string>
+    <string name="user_rename" msgid="8523499513614655279">"RENOMEAR"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Voltar"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Próximo"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Concluir"</string>
 </resources>

diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 6265900..f099394 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml

@@ -807,6 +807,14 @@
     <skip />
     <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
     <skip />
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_text_location_on (8135076005488914200) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_text_location_off (6323983741393280935) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_remember_choice (5340097010842405981) -->
+    <skip />
     <!-- no translation found for wifi_setting_sleep_policy_title (5149574280392680092) -->
     <skip />
     <!-- no translation found for wifi_setting_sleep_policy_error (8174902072673071961) -->
@@ -908,6 +916,12 @@
     <skip />
     <!-- no translation found for wifi_security_none (7985461072596594400) -->
     <skip />
+    <!-- no translation found for wifi_scan_always_turnon_message (203123538572122989) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_confirm_allow (5355973075896817232) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_confirm_deny (4463982053823520710) -->
+    <skip />
     <string name="wifi_connect" msgid="1076622875777072845">"Connectar"</string>
     <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
     <skip />
@@ -2282,6 +2296,12 @@
     <skip />
     <!-- no translation found for trusted_credentials_summary (6735221351155686632) -->
     <skip />
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
     <skip />
     <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
@@ -2872,16 +2892,30 @@
     <skip />
     <!-- no translation found for user_you_section (6247838798859425408) -->
     <skip />
-    <!-- no translation found for user_list_title (8866161687358773982) -->
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
     <skip />
     <!-- no translation found for user_add_user_menu (1675956975014862382) -->
     <skip />
+    <!-- no translation found for user_add_restricted (2355584640156396901) -->
+    <skip />
+    <!-- no translation found for user_add_restricted_summary (6627956758186349471) -->
+    <skip />
+    <!-- no translation found for user_add_trusted (557634297572871869) -->
+    <skip />
+    <!-- no translation found for user_add_trusted_summary (1118604533072902851) -->
+    <skip />
     <!-- no translation found for user_summary_active (4740649452346004418) -->
     <skip />
     <!-- no translation found for user_summary_inactive (3758296246095054572) -->
     <skip />
     <!-- no translation found for user_summary_not_set_up (8778205026866794909) -->
     <skip />
+    <!-- no translation found for user_trusted (6742122083463724471) -->
+    <skip />
+    <!-- no translation found for user_limited (5344145255529624480) -->
+    <skip />
     <!-- no translation found for user_owner (3879126011135546571) -->
     <skip />
     <!-- no translation found for user_nickname (5148818000228994488) -->
@@ -2926,6 +2960,12 @@
     <skip />
     <!-- no translation found for user_delete_button (5131259553799403201) -->
     <skip />
+    <!-- no translation found for application_restrictions (8207332020898004394) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_header (3660449891478534440) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_settings_button (3841347287916635821) -->
+    <skip />
     <!-- no translation found for global_change_warning (8045013389464294039) -->
     <skip />
     <!-- no translation found for global_change_warning (2461264421590324675) -->
@@ -2946,4 +2986,14 @@
     <skip />
     <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
     <skip />
+    <!-- no translation found for user_restrictions_title (371835484894400390) -->
+    <skip />
+    <!-- no translation found for user_rename (8523499513614655279) -->
+    <skip />
+    <!-- no translation found for wizard_back (5567007959434765743) -->
+    <skip />
+    <!-- no translation found for wizard_next (3606212602795100640) -->
+    <skip />
+    <!-- no translation found for wizard_finish (3286109692700083252) -->
+    <skip />
 </resources>

diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 6b12cf7..3d909a8 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Niciuna"</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">"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 b124062..517bb6d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanare mereu disponibilă"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Permiteți serviciului de localizare Google și altor aplicații să caute rețele, chiar dacă rețeaua Wi-Fi este dezactivată"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pentru a îmbunătăți precizia locației, dar și în alte scopuri, Google și alte aplicații pot căuta rețele în apropiere, chiar dacă rețeaua Wi-Fi este dezactivată. Dacă nu doriți acest lucru, accesați Avansate &gt; Scanare mereu disponibilă."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplicațiile pot căuta rețele în apropiere, chiar dacă rețeaua Wi-Fi este dezactivată. Dacă nu doriți acest lucru, accesați Avansate &gt; Scanare mereu disponibilă."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Nu mai afișa"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Securizată cu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", securizată cu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Niciuna"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pentru a îmbunătăți precizia locației, precum și pentru alte scopuri, <xliff:g id="APP_NAME">%1$s</xliff:g> solicită permisiunea să activeze scanarea rețelelor, chiar și atunci când rețeaua Wi-Fi este dezactivată."\n\n"Permiteți acest lucru pentru toate aplicațiile care solicită scanarea?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permiteți"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Respingeți"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectaţi-vă"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nu s-a putut stabili conexiunea la reţea"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Eliminaţi"</string>
@@ -883,10 +889,8 @@
     <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>
-    <!-- no translation found for mvno_type (2543253857818336421) -->
-    <skip />
-    <!-- no translation found for mvno_match_data (4560671695220540466) -->
-    <skip />
+    <string name="mvno_type" msgid="2543253857818336421">"Tip MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valoare MVNO"</string>
     <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>
@@ -1491,6 +1495,12 @@
     <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>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenaţi modelul pentru deblocare"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Trebuie să desenaţi modelul pentru deblocare pentru a confirma instalarea acreditării."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1799,11 +1809,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatoriu"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizatori"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Dvs."</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Alţi utilizatori"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adăugaţi utilizator"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"+Utilizator limitat"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Utilizatorii cu permisiuni limitate pot accesa numai aplicațiile și conținutul pe care le selectați"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"+Utilizat. încredere"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Utilizatorii de încredere nu au restricții"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Activ"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Inactiv"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Neconfigurat"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"De încredere"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Cu permisiuni limitate"</string>
     <string name="user_owner" msgid="3879126011135546571">"Proprietar"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Pseudonim"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Adăugaţi un utilizator nou"</string>
@@ -1826,6 +1845,9 @@
     <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="application_restrictions" msgid="8207332020898004394">"Permiteți aplicații și conținut"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicații cu restricții"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Extindeți setările aplicației"</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>
@@ -1836,4 +1858,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmisii celulare"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selectaţi tipurile de alerte de urgenţă de afişat."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Permiteți aplicații și conținut"</string>
+    <string name="user_rename" msgid="8523499513614655279">"REDENUMIȚI"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Înapoi"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Înainte"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Finalizați"</string>
 </resources>

diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 0504727..c63f13d 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml

@@ -218,10 +218,12 @@
     <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="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-ru/strings.xml b/res/values-ru/strings.xml
index 57a10ed..7466588 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Всегда искать сети"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Разрешить службе геопозиционирования и другим приложениям Google искать сети, даже если модуль Wi-Fi выключен"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Чтобы улучшить определение местоположения, а также для достижения других целей, Google и другие приложения могут выполнять поиск сетей поблизости, даже если сеть Wi-Fi отключена. Чтобы изменить эти настройки, перейдите в меню \"Дополнительно &gt; Всегда искать сети\"."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Приложения могут выполнять поиск сетей поблизости, даже если сеть Wi-Fi отключена. Чтобы изменить эти настройки, перейдите в меню \"Дополнительно &gt; Всегда искать сети\"."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Больше не показывать"</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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Нет"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Чтобы определение местоположения и некоторые другие функции работали лучше, приложению \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" необходимо выполнять поиск сетей, даже если модуль Wi-Fi отключен."\n\n"Разрешить?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Разрешить"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Отклонить"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Подключить"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Не удалось подключиться к сети."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Удалить"</string>
@@ -883,10 +889,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>
-    <!-- no translation found for mvno_type (2543253857818336421) -->
-    <skip />
-    <!-- no translation found for mvno_match_data (4560671695220540466) -->
-    <skip />
+    <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">"Новая точка доступа"</string>
     <string name="menu_save" msgid="8109345640668285399">"Сохранить"</string>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Удалить все сертификаты"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Надежные сертификаты"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показывать надежные сертификаты ЦС"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Начертите графический ключ"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Чтобы подтвердить установку учетных данных, начертите графический ключ."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1800,11 +1810,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Блокировка"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Пользователи"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Вы"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Другие пользователи"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Добавить пользователя"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Доб. огран. пользов."</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Ограниченным пользователям доступны только указанные вами приложения и контент"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Доб. надеж. пользов."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Для надежных пользователей ограничения не устанавливаются"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Активен"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Неактивен"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не настроено"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Надежный"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Ограниченный"</string>
     <string name="user_owner" msgid="3879126011135546571">"Владелец"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Псевдоним"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Добавить пользователя"</string>
@@ -1827,6 +1846,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Добавление…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Удалить пользователя"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Удалить"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Разрешить приложения и контент"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничениями"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Развернуть настр. приложений"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Настройки будут изменены для всех пользователей устройства."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройки будут изменены для всех пользователей устройства."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Измените язык"</string>
@@ -1837,4 +1859,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Документ с фото"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Широковещательная передача сообщений"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Выберите типы экстренных оповещений на экране."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Разрешить приложения и контент"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПЕРЕИМЕНОВАТЬ"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Назад"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Далее"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Готово"</string>
 </resources>

diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index e23c6ad..6ab5e68 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml

@@ -218,10 +218,12 @@
     <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="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">"Interný ukladací priestor zariadenia"</item>
     <item msgid="3738430123799803530">"Odnímateľná karta SD"</item>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4e56ccd..92e36b9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Vyhľadávanie vždy zapnuté"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Povoliť službe určovania polohy Google a ostatným aplikáciám vyhľadávať siete aj v prípade, že je sieť Wi-Fi vypnutá"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Služby Google a ďalšie aplikácie môžu s cieľom zvýšenia presnosti a inými cieľmi vyhľadávať siete v blízkosti aj v prípade, že je sieť Wi-Fi vypnutá. Ak chcete nastavenie zmeniť, prejdite do časti Rozšírené &gt; Vyhľadávanie vždy zapnuté"</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikácie môžu vyhľadávať siete v blízkosti aj v prípade, že je sieť Wi-Fi vypnutá. Ak chcete nastavenie zmeniť, prejdite do časti Rozšírené &gt; Vyhľadávanie vždy zapnuté."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Túto správu znova nezobrazovať"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpečenie: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečenie: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Žiadne"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť vyhľadávanie sietí (z dôvodu dosiahnutia vyššej presnosti určovania polohy aj z iných dôvodov) a hľadať siete aj v prípade, že je vypnutý modul Wi-Fi."\n\n"Chcete túto možnosť povoliť všetkým aplikáciám, ktoré chcú vyhľadávať siete?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povoliť"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Odmietnuť"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Pripojiť"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nepodarilo sa pripojiť k sieti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstrániť"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Typ MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Hodnota MVNO"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Odstrániť všetky certifikáty"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Dôveryhodné poverenia"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobraziť dôveryhodné certifikáty CA"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Nakreslite bezpečnostný vzor"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Inštaláciu poverení je potrebné potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Prísne"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Používatelia"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Vy"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Ďalší používatelia"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Pridať používateľa"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Pridať použ. s obmedz. príst."</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Používatelia s obmedzeným prístupom môžu používať iba aplikácie a obsah, ktoré vyberiete"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Pridať dôveryh. použív."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Dôveryhodní používatelia nemajú žiadne obmedzenia"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktívne"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktívne"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nenastavené"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Dôveryhodný"</string>
+    <string name="user_limited" msgid="5344145255529624480">"S obmedzeniami"</string>
     <string name="user_owner" msgid="3879126011135546571">"Vlastník"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Prezývka"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Pridať nového používateľa"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Pridáv. nového používateľa..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Odstrániť používateľa"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Odstrániť"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Povoliť aplikácie a obsah"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikácie s obmedzením"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbaliť nastavenia aplikácie"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Toto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Zmeniť jazyk"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Hromadné zasielanie správ v rámci bunky"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vyberte typy tiesňových upozornení, ktoré sa majú zobraziť."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Povoliť aplikácie a obsah"</string>
+    <string name="user_rename" msgid="8523499513614655279">"PREMENOVAŤ"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Späť"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Ďalej"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Dokončiť"</string>
 </resources>

diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 655d226..d31eb74 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Brez"</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">"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 7c21255..dee0a09 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Iskanje vedno na voljo"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Googlova lokacijska storitev in druge aplikacije naj poiščejo omrežja, tudi če je Wi-Fi izklopljen"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Za večjo natančnost in druge namene dovolite Googlovi lokacijski storitvi in drugim aplikacijam, da iščejo omrežja Wi-Fi v bližini, tudi če je Wi-Fi izklopljen. Če tega ne želite, odprite Dodatno &gt; Iskanje vedno na voljo."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacije lahko iščejo omrežja Wi-Fi v bližini, tudi če je Wi-Fi izklopljen. Če tega ne želite, odprite Dodatno &gt; Iskanje vedno na voljo."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Tega ne kaži več"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zaščiteno z <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zaščiteno z <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Brez"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Za izboljšanje natančnosti lokacijskih podatkov in druge namene želi <xliff:g id="APP_NAME">%1$s</xliff:g> vklopiti iskanje omrežij, tudi ko je Wi-Fi izklopljen."\n\n"Želite to dovoliti vsem aplikacijam, ki želijo iskati omrežja?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dovoli"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Zavrni"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Vzpostavi povezavo"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Vzpostavljanje povezave z omrežjem ni uspelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pozabi"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Vrsta MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Vrednost MVNO"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Odstrani vsa potrdila"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Preverjene poverilnice"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaži zaupanja vredna potrdila overiteljev"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Narišite vzorec za odklepanje"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Če želite potrditi ponastavitev na tovarniške nastavitve, morate narisati vzorec za odklepanje."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Uveljavljajoče"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Uporabniki"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Vi"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Drugi uporabniki"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj uporabnika"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Dodajanje uporabnika z omejitvami"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Uporabniki z omejitvami lahko dostopajo le do aplikacij in vsebine, ki jih določite vi"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Dodajanje zaupanja vrednega uprabnika"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Zaupanja vredni uporabniki nimajo omejitev"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktiven"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktiven"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Uporabnik ni nastavljen"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Zaupanja vreden"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Z omejitvami"</string>
     <string name="user_owner" msgid="3879126011135546571">"Lastnik"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Vzdevek"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj novega uporabnika"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Dodajanje novega uporabnika ..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Izbriši uporabnika"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Izbriši"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Omogočanje aplikacij in vsebine"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije z omejitvami"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Dodatne nastavitve za aplikacijo"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Nastavitev vpliva na vse uporabnike v tem tabličnem računalniku."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Nastavitev vpliva na vse uporabnike v tem telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Spremenjen jezik"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Oddaje v celici"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Izberite vrste nujnih opozoril, ki jih želite prikazati."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Omogočanje aplikacij in vsebine"</string>
+    <string name="user_rename" msgid="8523499513614655279">"PREIMENOVANJE"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Nazaj"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Naprej"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Dokončaj"</string>
 </resources>

diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 4bbeb43..8552560 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml

@@ -218,10 +218,12 @@
     <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="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-sr/strings.xml b/res/values-sr/strings.xml
index e83d5be..28cc2e3 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Скенирање је увек доступно"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Дозволите Google-овој услузи лоцирања и другим апликацијама да скенирају мреже, чак и када је Wi-Fi искључен"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Да би, између осталог, побољшале тачност локације, Google и друге апликације могу да скенирају оближње мреже, чак и када је Wi-Fi искључен. Ако не желите да се то дешава, идите на Напредно &gt; Скенирање је увек доступно."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Апликације могу да скенирају оближње мреже, чак и када је Wi-Fi искључен. Ако не желите да се то дешава, идите на Напредно &gt; Скенирање је увек доступно."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Не приказуј поново"</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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Обезбеђено помоћу <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", обезбеђено помоћу <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ништа"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Због побољшања прецизности локације и у друге сврхе, <xliff:g id="APP_NAME">%1$s</xliff:g> жели да укључи скенирање мреже чак и када је Wi-Fi искључен."\n\n"Желите ли да дозволите ово за све апликације које желе да скенирају?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволи"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Одбиј"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Повежи"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Повезивање са мрежом није успело"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Заборави"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Тип MVNO-а"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Вредност MVNO-а"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Избриши назив приступне тачке"</string>
     <string name="menu_new" msgid="3014205883303921729">"Нов назив приступне тачке"</string>
     <string name="menu_save" msgid="8109345640668285399">"Сачувај"</string>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Уклањање свих сертификата"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Поуздани акредитиви"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Прикажи поуздане CA сертификате"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Нацртајте шаблон за откључавање"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Потребно је да нацртате шаблон за откључавање да бисте потврдили инсталацију акредитива."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Спровођење"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Корисници"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Ви"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Остали корисници"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Додај корисника"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Додај корисника с ограничењем"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Корисници с ограничењем могу да приступају само апликацијама и садржају које изаберете"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Додај поузданог"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Поуздани корисници немају ограничења"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Активан"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Није активан"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Није подешено"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Поуздани"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Са ограниченим приступом"</string>
     <string name="user_owner" msgid="3879126011135546571">"Власник"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Надимак"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Додавање новог корисника"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Додавање новог корисника..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Брисање корисника"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Избриши"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Дозволе за апликације и садржај"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликације са ограничењима"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири подешавања апликације"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ово подешавање утиче на све кориснике овомг таблета."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ово подешавање утиче на све кориснике овог телефона."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Промена језика"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ИД слике"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Поруке инфо сервиса"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Изаберите типове упозорења на хитне случајеве који ће се приказивати."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Дозволе за апликације и садржај"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПРЕИМЕНУЈ"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Назад"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Даље"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Заврши"</string>
 </resources>

diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 99743f3..941aee8 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml

@@ -218,10 +218,12 @@
     <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="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">"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 43a1061..26bd859 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Inställningen \"sök alltid\" är tillgänglig"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Tillåt att Googles platstjänst och andra appar söker efter nätverk, även när Wi-Fi inte har aktiverats"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"För att bland annat noggrannheten i platsangivelsen ska förbättras kan Google och vissa appar söka efter nätverk i närheten även när Wi-Fi är avstängt. Om du inte vill att detta ska ske väljer du Avancerat &gt; Inställningen \"sök alltid\" är tillgänglig."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Appar kan söka efter nätverk i närheten även om Wi-Fi är avstängt. Om du inte vill att det ska hända väljer du Avancerat &gt; Inställningen \"sök alltid\" är tillgänglig."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Visa inte igen"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Skyddad med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", skyddad med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill aktivera nätverkssökning även när Wi-Fi är avstängt för att kunna förbättra positionens exakthet och andra ändamål."\n\n"Vill du tillåta detta för alla appar som vill söka efter nätverk?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillåt"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Avvisa"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Anslut"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Det gick inte att ansluta till nätverket."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glöm"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"MVNO-typ"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-värde"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Ta bort alla certifikat"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Tillförlitlig autentisering"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Visa tillförlitliga CA-certifikat"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Rita ditt grafiska lösenord"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du måste rita ditt grafiska lösenord för att bekräfta uppgifterna."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Genomdrivande"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Användare"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Du"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Andra användare"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Lägg till användare"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Lägg t. begr. anv."</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Begränsade användare kan bara använda appar och innehåll som du väljer"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Lägg t. betr. anv."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Betrodda användare har inga begränsningar"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktiv"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Ej aktiv"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Inte konfigurerad"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Betrodda"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Begränsad"</string>
     <string name="user_owner" msgid="3879126011135546571">"Ägare"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Smeknamn"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Lägg till en ny användare"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"En ny användare läggs till …"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Ta bort användare"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Ta bort"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Tillåt appar och innehåll"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Appar med begränsningar"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Utöka appens inställningar"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Den här inställningen påverkar samtliga användare."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Den här inställningen påverkar samtliga användare."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Ändra språk"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcasts"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Välj vilka typer av varningsmeddelanden som ska visas."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Tillåt appar och innehåll"</string>
+    <string name="user_rename" msgid="8523499513614655279">"BYT NAMN"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Föregående"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Nästa"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Slutför"</string>
 </resources>

diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index efa4f21..d7c0c7b 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml

@@ -218,10 +218,12 @@
     <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="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">"Kifaa cha hifadhi ya ndani"</item>
     <item msgid="3738430123799803530">"Kadi ya SD inayoondolewa"</item>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d14de57..19a901b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -532,9 +532,15 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Kuchanganua kunapatikana wakati wote"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Ruhusu huduma ya eneo la Google na programu nyingine zichanganue mitandao, hata wakati Wi-Fi imezimwa"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <!-- no translation found for wifi_scan_notify_text_location_on (8135076005488914200) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_text_location_off (6323983741393280935) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_remember_choice (5340097010842405981) -->
     <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>
@@ -597,6 +603,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Imelindwa na <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", imelindwa na <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Hamna"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ili kuboresha usahihi wa eneo na kwa madhumuni mengine, <xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha uchunguzaji wa mtandao, hata wakati Wi-Fi inapokuwa imezimwa."\n\n"Je, ungependa kuruhusu haya kwa programu zote ambazo ungependa kuchunguza?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Ruhusu"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Kataa"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Unganisha"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Imeshindwa kuunganisha kwa mtandao"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Sahau"</string>
@@ -875,10 +884,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Aina ya MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Thamani ya MVNO"</string>
     <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>
@@ -1000,7 +1007,7 @@
     <string name="lock_settings_title" msgid="335025124489630932">"Usalama wa skrini"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Badilisha umbo la kufungua"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Badilisha PIN ya kufungua"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Thibitisha ruwaza iliyohifadhiwa"</string>
+    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Thibitisha mchoro uliohifadhiwa"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Jaribu tena:"</string>
     <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Chora ruwaza ya kufungua:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Bonyeza menyu upate usaidizi"</string>
@@ -1482,6 +1489,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Ondoa vyeti vyote"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Stakabadhi zinazoaminika"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Onyesha vyeti vyako amilifu vya CA"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Chora mchoro wako wa kufungua"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Unahitaji kuchora mchoro wako wa kufungua ili kuthibitisha usakinishaji wa hati tambulishi."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1634,7 +1647,7 @@
     <string name="pointer_location_summary" msgid="840819275172753713">"Kuegeshwa kwa skrini ikionyesha data ya mguso ya sasa"</string>
     <string name="show_touches" msgid="1356420386500834339">"Onyesha miguso"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Onyesha mwitikio wa kuonekana wa miguso"</string>
-    <string name="show_screen_updates" msgid="5470814345876056420">"Onyesha sasishi za sehemu"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Onyesha masasisho ya sehemu"</string>
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Angaza dirisha lote zitakaposasisha"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Onyesha sasisho za mtazamo wa GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Kiwango cha maoni ndani ya madirisha wakati yanatolewa na GPU"</string>
@@ -1790,11 +1803,26 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Inatekeleza"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Watumiaji"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Wewe"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Watumiaji wengine"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ongeza mtumiaji"</string>
+    <!-- no translation found for user_add_restricted (2355584640156396901) -->
+    <skip />
+    <!-- no translation found for user_add_restricted_summary (6627956758186349471) -->
+    <skip />
+    <!-- no translation found for user_add_trusted (557634297572871869) -->
+    <skip />
+    <!-- no translation found for user_add_trusted_summary (1118604533072902851) -->
+    <skip />
     <string name="user_summary_active" msgid="4740649452346004418">"Amilifu"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Sio amilifu"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Haijasanidiwa"</string>
+    <!-- no translation found for user_trusted (6742122083463724471) -->
+    <skip />
+    <!-- no translation found for user_limited (5344145255529624480) -->
+    <skip />
     <string name="user_owner" msgid="3879126011135546571">"Mmiliki"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Jina la utani"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Ongeza mtumiaji mpya"</string>
@@ -1817,6 +1845,12 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Inaongeza mtumiaji mpya..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Futa mtumiaji"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Futa"</string>
+    <!-- no translation found for application_restrictions (8207332020898004394) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_header (3660449891478534440) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_settings_button (3841347287916635821) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Mpangilio huu unaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Mpangilio huu unaathiri watumiaji wote kwenye simu hii."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Badilisha lugha"</string>
@@ -1827,4 +1861,14 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Kitambulisho cha Picha"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Matangazo ya simu"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Chagua aina ya arifa za dharura za kuonyesha."</string>
+    <!-- no translation found for user_restrictions_title (371835484894400390) -->
+    <skip />
+    <!-- no translation found for user_rename (8523499513614655279) -->
+    <skip />
+    <!-- no translation found for wizard_back (5567007959434765743) -->
+    <skip />
+    <!-- no translation found for wizard_next (3606212602795100640) -->
+    <skip />
+    <!-- no translation found for wizard_finish (3286109692700083252) -->
+    <skip />
 </resources>

diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 19c5889..324463d 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml

@@ -218,10 +218,12 @@
     <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="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-th/strings.xml b/res/values-th/strings.xml
index b6f14ee..2939974 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -540,9 +540,15 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"ใช้การสแกนได้เสมอ"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"ให้บริการตำแหน่งของ Google และแอปอื่นๆ สแกนหาเครือข่ายได้ แม้ในขณะที่ WiFi ปิดอยู่"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <!-- no translation found for wifi_scan_notify_text_location_on (8135076005488914200) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_text_location_off (6323983741393280935) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_remember_choice (5340097010842405981) -->
     <skip />
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"เปิด WiFi ระหว่างที่อยู่ในโหมดสลีป"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"มีปัญหาในการเปลี่ยนแปลงการตั้งค่า"</string>
@@ -605,6 +611,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"ป้องกันด้วย <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">" ป้องกันด้วย <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"ไม่มี"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง และเพื่อวัตถุประสงค์อื่น ๆ <xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการเปิดการสแกนเครือข่าย แม้ในขณะที่ไม่มี Wi-Fi "\n" "\n" อนุญาตให้ดำเนินการนี้สำหรับแอปทั้งหมดที่ต้องการสแกนหรือไม่"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"อนุญาต"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ปฏิเสธ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"เชื่อมต่อ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ไม่สามารถเชื่อมต่อกับเครือข่าย"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ไม่จำ"</string>
@@ -883,10 +892,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>
-    <!-- no translation found for mvno_type (2543253857818336421) -->
-    <skip />
-    <!-- no translation found for mvno_match_data (4560671695220540466) -->
-    <skip />
+    <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>
@@ -975,7 +982,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"ตำแหน่งและ Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"ให้ Google ใช้ตำแหน่งของคุณในการปรับปรุงผลการค้นหาและบริการอื่นๆ ให้ดียิ่งขึ้น"</string>
     <string name="location_access_title" msgid="7064108942964081243">"การเข้าถึงตำแหน่งของฉัน"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"ให้แอปพลิเคชันที่ได้ขออนุญาตจากคุณใช้ข้อมูลตำแหน่งของคุณ"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"ให้แอปที่ขออนุญาตแล้วใช้ข้อมูลตำแหน่งของคุณได้"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"ที่มาของตำแหน่ง"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"เกี่ยวกับแท็บเล็ต"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"เกี่ยวกับโทรศัพท์"</string>
@@ -1490,6 +1497,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"นำใบรับรองทั้งหมดออก"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"ข้อมูลรับรองที่เชื่อถือได้"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"แสดงใบรับรอง CA ที่เชื่อถือได้"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"วาดรูปแบบการปลดล็อกของคุณ"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"คุณจำเป็นต้องวาดรูปแบบการปลดล็อกของคุณเพื่อยืนยันการติดตั้งข้อมูลรับรอง"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1811,26 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"บังคับใช้งาน"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"ผู้ใช้"</string>
     <string name="user_you_section" msgid="6247838798859425408">"คุณ"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"ผู้ใช้รายอื่นๆ"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"เพิ่มผู้ใช้"</string>
+    <!-- no translation found for user_add_restricted (2355584640156396901) -->
+    <skip />
+    <!-- no translation found for user_add_restricted_summary (6627956758186349471) -->
+    <skip />
+    <!-- no translation found for user_add_trusted (557634297572871869) -->
+    <skip />
+    <!-- no translation found for user_add_trusted_summary (1118604533072902851) -->
+    <skip />
     <string name="user_summary_active" msgid="4740649452346004418">"ใช้งานอยู่"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"ไม่ได้ใช้งาน"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"ไม่ได้ตั้งค่า"</string>
+    <!-- no translation found for user_trusted (6742122083463724471) -->
+    <skip />
+    <!-- no translation found for user_limited (5344145255529624480) -->
+    <skip />
     <string name="user_owner" msgid="3879126011135546571">"เจ้าของ"</string>
     <string name="user_nickname" msgid="5148818000228994488">"ชื่อเล่น"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"เพิ่มผู้ใช้ใหม่"</string>
@@ -1825,6 +1853,12 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"กำลังเพิ่มผู้ใช้ใหม่…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"ลบผู้ใช้"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"ลบ"</string>
+    <!-- no translation found for application_restrictions (8207332020898004394) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_header (3660449891478534440) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_settings_button (3841347287916635821) -->
+    <skip />
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"การตั้งค่านี้ส่งผลต่อผู้ใช้แท็บเล็ตนี้ทุกราย"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"การตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"เปลี่ยนภาษา"</string>
@@ -1835,4 +1869,14 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID รูปภาพ"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"การแจ้งเครือข่ายที่ใช้งาน"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"เลือกประเภทของการแจ้งเตือนฉุกเฉินที่จะแสดง"</string>
+    <!-- no translation found for user_restrictions_title (371835484894400390) -->
+    <skip />
+    <!-- no translation found for user_rename (8523499513614655279) -->
+    <skip />
+    <!-- no translation found for wizard_back (5567007959434765743) -->
+    <skip />
+    <!-- no translation found for wizard_next (3606212602795100640) -->
+    <skip />
+    <!-- no translation found for wizard_finish (3286109692700083252) -->
+    <skip />
 </resources>

diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 9006444..bf7da47 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml

@@ -218,10 +218,12 @@
     <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="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">"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 e891eba..e51bd7b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Palaging available ang pag-scan"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Hayaang mag-scan ng mga network ang serbisyo sa lokasyon ng Google at iba pang apps, kahit na naka-off ang Wi-Fi"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Upang mapahusay ang katumpakan ng lokasyon at para sa iba pang mga layunin, maaaring mag-scan ang Google at ang iba pang app kung may mga network sa malapit, kahit na naka-off ang Wi-Fi. Kung hindi mo ito gustong mangyari, pumunta sa Advanced &gt; Palaging available ang pag-scan."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Maaaring mag-scan ang apps kung may mga network sa malapit, kahit na naka-off ang Wi-Fi. Kung hindi mo ito gustong mangyari, pumunta sa Advanced &gt; Palaging available ang pag-scan."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Huwag ipakitang muli"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Naka-secure gamit ang <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", naka-secure gamit ang <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Wala"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Upang mapahusay ang katumpakan ng lokasyon at para sa iba pang mga layunin, gustong i-on ng <xliff:g id="APP_NAME">%1$s</xliff:g> ang pag-scan ng network, kahit na naka-off ang Wi-Fi."\n\n"Payagan ito para sa lahat ng apps na gustong mag-scan?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Payagan"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Tanggihan"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kumonekta"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nabigong kumonekta sa network."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Kalimutan"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Uri ng MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Halaga ng MVNO"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alisin ang lahat ng certificate"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pinagkakatiwalaang kredensyal"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Ipakita ang mga pinagkakatiwalaang mga CA certificate"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Iguhit ang iyong pattern sa pag-unlock"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kailangan mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-install ng kredensyal."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Nagpapatupad"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Mga User"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Ikaw"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Iba pang mga user"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Idagdag ang user"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Add limited user"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Ang apps at nilalaman lang na iyong pipiliin ang maa-access ng mga limitadong user"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Add trusted user"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Walang paghihigpit sa mga pinagkakatiwalaang user"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Aktibo"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Hindi aktibo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Hindi naka-set up"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Pinagkakatiwalaan"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Limitado"</string>
     <string name="user_owner" msgid="3879126011135546571">"May-ari"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Palayaw"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Idagdag ang bagong user"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Nagdaragdag ng bagong user…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Tanggalin ang user"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Tanggalin"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Payagan ang apps at nilalaman"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Mga application na may mga paghihigpit"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Palawakin ang mga setting para sa application"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Nakakaapekto ang setting na ito sa lahat ng user sa tablet na ito."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Nakakaapekto ang setting na ito sa lahat ng user sa teleponong ito."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Baguhin ang wika"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mga cell broadcast"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Piliin ang mga uri ng mga alerto sa emergency na ipapakita."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Payagan ang apps at nilalaman"</string>
+    <string name="user_rename" msgid="8523499513614655279">"I-RENAME"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Bumalik"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Susunod"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Tapusin"</string>
 </resources>

diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index fd3fd09..31b15f0 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Yok"</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">"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 213d032..fb6b053 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -424,14 +424,14 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Bağlantıları yönet, cihaz adını gir ve keşfedilebilirlik ayarını yap"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth eşleşme isteği"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşleştirmek için cihazın istenen PIN\'ini yazın:"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşleştirmek için cihazın istenen passkey kodunu yazın:"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşlemek için cihazın istenen PIN\'ini yazın:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşlemek için cihazın istenen passkey kodunu yazın:"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN, harfler veya simgeler içerir"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Genellikle 0000 veya 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Bu PIN\'i diğer cihazda da yazmanız gerekebilir."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Bu passkey kodunu diğer cihazda da girmeniz gerekebilir."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Şu cihazla eşleştirmek için:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Şu passkey kodunun göründüğünden emin olun:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Kaynak:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bu cihaz ile eşleştirilsin mi?"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Kaynak:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bu cihaz ile eşlensin mi?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşleştirmek için cihaz üzerinde <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> yazarak Return veya Enter tuşuna basın."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Eşleştir"</string>
     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"İptal"</string>
@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Tarama her zaman kullanılabilir"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Kablosuz özelliği kapalıyken dahi Google\'ın konum hizmetinin ve diğer uygulamaların ağları taramasına izin ver"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Konum doğruluğunu iyileştirmek için ve diğer amaçlarla, Google ve diğer uygulamalar, Kablosuz kapalı olduğunda dahi yakınlardaki ağları tarayabilir. Bunu istemiyorsanız, Gelişmiş &gt; Tarama her zaman kullanılabilir seçeneğine gidin."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Uygulamalar, Kablosuz bağlantı kapalı olduğunda dahi yakınlardaki ağları tarayabilir. Bunu istemiyorsanız, Gelişmiş &gt; Tarama her zaman kullanılabilir seçeneğine gidin."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Bir daha gösterme"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Güvenliği <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> ile sağlanıyor"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", güvenliği <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> ile sağlanıyor"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Yok"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Konum bilgisinin doğruluğunu artırmak ve diğer amaçlar için, <xliff:g id="APP_NAME">%1$s</xliff:g> Kablosuz bağlantı kapalı olduğunda bile ağ tarama işlevini açmak istiyor."\n\n"Tarama yapmak isteyen tüm uygulamaların bu işlevi kullanmalarına izin veriyor musunuz?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"İzin ver"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Reddet"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Bağlan"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ağa bağlanılamadı"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unut"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"MVNO türü"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO değeri"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Tüm sertifikaları kaldır"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Güvenilir kimlik bilgisi"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Güvenilir CA sertifikalarını görüntüle"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Kilit açma deseninizi çizin"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kimlik bilgisi yüklemesini onaylamak için kilit açma desenini çizmeniz gerekiyor."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing (Zorunlu)"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Kullanıcılar"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Siz"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Diğer kullanıcılar"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Kullanıcı ekle"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Sınırlı kullanıcı ekle"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Sınırlı kullanıcılar sadece sizin seçtiğiniz uygulamalara ve içeriğe erişebilir"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Güvenilir kullanıcı ekle"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Güvenilir kullanıcıların kısıtlaması yoktur"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Etkin"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Etkin değil"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Yapılandırılmadı"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Güvenilir"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Sınırlı"</string>
     <string name="user_owner" msgid="3879126011135546571">"Sahibi"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Takma Ad"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Yeni kullanıcı ekle"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Yeni kullanıcı ekleniyor..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Kullanıcıyı sil"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Sil"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Uygulamalara ve içeriğe izin ver"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Kısıtlamalı uygulamalar"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Uygulama ayarlarını genişlet"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Bu ayar bu tabletteki tüm kullanıcıları etkiler."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Bu ayar bu telefondaki tüm kullanıcıları etkiler."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Dili değiştir"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Fotoğraflı Kimlik"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Hücre yayınları"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Görüntülenecek acil durum uyarı türünü seçin."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Uygulamalara ve içeriğe izin ver"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ADINI DEĞİŞTİR"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Geri"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"İleri"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Son"</string>
 </resources>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 28b699c..b7d77d4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -542,6 +542,11 @@
     <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>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
+    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей, Google та інші програми можуть шукати мережі поблизу, навіть якщо Wi-Fi вимкнено. Щоб скасувати цей дозвіл, перейдіть у меню Розширені &gt; Сканування завжди доступне."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Програми можуть шукати мережі поблизу, навіть якщо Wi-Fi вимкнено. Щоб скасувати цей дозвіл, перейдіть у меню Розширені &gt; Сканування завжди доступне."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Більше не показувати"</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>
@@ -603,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Захищено: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", захищено: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Немає"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей, програма <xliff:g id="APP_NAME">%1$s</xliff:g> хоче вмикати сканування мережі, навіть коли Wi-Fi вимкнено."\n\n"Дозволити це для всіх програм, які потребують сканування?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволити"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Відхилити"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Підключ."</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Помилка під’єднання до мережі."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Видалити"</string>
@@ -1486,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Видалити всі сертифікати"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Надійні облікові дані"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показати надійні сертифікати ЦС"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Намалюйте ключ розблокування"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Щоб підтвердити встановлення облікових даних, потрібно намалювати ключ розблокування."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1794,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Застосовано"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Користувачі"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Ви"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Інші користувачі"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Додати користувача"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Додати обмеж.корист."</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Обмежені користувачі можуть отримувати доступ лише до вибраних вами програм і вмісту"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Додати довір.корист."</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Довірені користувачі не мають жодних обмежень"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Активний"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Неактивний"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не створено"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Довірений"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Обмежений"</string>
     <string name="user_owner" msgid="3879126011135546571">"Власник"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Псевдонім"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Додати нового користувача"</string>
@@ -1821,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Додавання нового користувача…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Видалити користувача"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Видалити"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Дозволи для програм і вмісту"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Програми з обмеженнями"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Розгорнути налашт-ня для прогр."</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Це налаштування впливає на всіх користувачів цього планшетного ПК."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Це налаштування впливає на всіх користувачів цього телефону."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Змінити мову"</string>
@@ -1831,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Ідентифікатор фотографії"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Широкомовні повідомлення мережі"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Виберіть типи сповіщень про надзвичайні ситуації, які мають відображатися."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Дозволи для програм і вмісту"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПЕРЕЙМЕНУВАТИ"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Назад"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Далі"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Завершити"</string>
 </resources>

diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index a511b64..82ff460 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Không có"</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">"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 f9379a8..a836fcb 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Tùy chọn quét luôn sẵn sàng"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Cho phép dịch vụ định vị và các ứng dụng khác của Google quét tìm mạng, ngay cả khi Wi-Fi bị tắt"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Để nâng cao độ chính xác và cho các mục đích khác, Google và các ứng dụng khác có thể quét tìm các mạng gần đó, ngay cả khi Wi-Fi bị tắt. Nếu bạn không muốn điều này xảy ra, hãy đi đến Nâng cao &gt; Tùy chọn quét luôn sẵn sàng."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Ứng dụng có thể quét tìm các mạng gần đó, ngay cả khi Wi-Fi bị tắt. Nếu bạn không muốn điều này xảy ra, hãy đi đến Nâng cao &gt; Tùy chọn quét luôn sẵn sàng."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Không hiển thị nữa"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Được bảo mật bằng <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", được bảo mật bằng <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Không"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Để nâng cao độ chính xác vị trí và phục vụ các mục đích khác, <xliff:g id="APP_NAME">%1$s</xliff:g> muốn bật tính năng quét mạng ngay cả khi Wi-Fi đang tắt."\n\n"Cho phép cài đặt này đối với tất cả ứng dụng muốn quét?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Cho phép"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Từ chối"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kết nối"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Không thể kết nối với mạng"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Quên"</string>
@@ -883,10 +889,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Kiểu MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Giá trị MVNO"</string>
     <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>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Xóa tất cả chứng chỉ"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Thông tin đăng nhập tin cậy"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Hiển thị chứng chỉ CA tin cậy"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Vẽ hình mở khóa của bạn"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Bạn cần vẽ hình mở khóa của mình để xác nhận cài đặt thông tin xác thực."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Thực thi"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Người dùng"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Bạn"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Người dùng khác"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Thêm người dùng"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Thêm n.dùng bị h.chế"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Chỉ người dùng bị hạn chế mới có thể truy cập vào ứng dụng và nội dung bạn chọn"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Thêm n.dùng tin cậy"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Người dùng tin cậy không có hạn chế nào"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Đang hoạt động"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Không hoạt động"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Chưa thiết lập"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Đáng tin cậy"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Hạn chế"</string>
     <string name="user_owner" msgid="3879126011135546571">"Chủ sở hữu"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Biệt hiệu"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Thêm người dùng mới"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Đang thêm người dùng mới..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Xóa người dùng"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Xóa"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Cho phép ứng dụng và nội dung"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Ứng dụng có hạn chế"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Mở rộng cài đặt cho ứng dụng"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Cài đặt này ảnh hưởng đến tất cả người dùng trên máy tính bảng này."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Cài đặt này ảnh hưởng đến tất cả người dùng trên điện thoại này."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Thay đổi ngôn ngữ"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID ảnh"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Phát sóng trên di động"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Chọn các loại cảnh báo khẩn cấp để hiển thị."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Cho phép ứng dụng và nội dung"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ĐỔI TÊN"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Quay lại"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Tiếp theo"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Hoàn tất"</string>
 </resources>

diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index b007791..723b979 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml

@@ -218,10 +218,12 @@
     <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="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-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c3afdbe..584d885 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"一律进行扫描"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"即使在 Wi-Fi 关闭时，也允许 Google 的位置服务和其他应用扫描网络"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"为了提高位置信息精确度以及其他目的，Google 和其他应用可扫描附近的网络（即便关闭了 Wi-Fi 也可以扫描）。如果您不希望进行扫描，请依次转到“高级”&gt;“始终进行扫描”。"</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"即使在 Wi-Fi 关闭时，应用也可扫描附近的网络。如果您不希望进行扫描，请依次转到“高级”&gt;“始终进行扫描”。"</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"不再显示"</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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"通过 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 进行保护"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，通过 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 进行保护"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"无"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"为了提高位置信息精确度以及其他目的，“<xliff:g id="APP_NAME">%1$s</xliff:g>”请求启用网络扫描功能（在关闭了 Wi-Fi  时也可进行扫描）。"\n\n"是否对所有需要进行扫描的应用批准这项请求？"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允许"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"拒绝"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"连接"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"无法连接网络"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"取消保存"</string>
@@ -883,10 +889,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>
-    <!-- no translation found for mvno_type (2543253857818336421) -->
-    <skip />
-    <!-- no translation found for mvno_match_data (4560671695220540466) -->
-    <skip />
+    <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>
@@ -974,7 +978,7 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"使用服务器来辅助 GPS（取消选中可提高 GPS 性能）"</string>
     <string name="use_location_title" msgid="5206937465504979977">"位置和 Google 搜索"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"允许 Google 使用您的位置信息改善搜索结果和其他服务"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"允许访问我的位置信息"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"允许使用我的位置信息"</string>
     <string name="location_access_summary" msgid="69031404093194341">"允许得到您许可的应用使用您的位置信息"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"位置信息来源"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"关于平板电脑"</string>
@@ -1490,6 +1494,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"删除所有证书"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"受信任的凭据"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"显示受信任的 CA 证书"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"绘制您的解锁图案"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您需要绘制解锁图案，以确认凭据安装操作。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1798,11 +1808,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"执行中"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"用户"</string>
     <string name="user_you_section" msgid="6247838798859425408">"您"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"其他用户"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"添加用户"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"添加受限用户"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"受限用户仅能访问您选择的应用和内容"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"添加受信任的用户"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"受信任的用户不受任何限制"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"活动"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"非活动"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"未设置"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"受信任的"</string>
+    <string name="user_limited" msgid="5344145255529624480">"受限的"</string>
     <string name="user_owner" msgid="3879126011135546571">"机主"</string>
     <string name="user_nickname" msgid="5148818000228994488">"昵称"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"添加新用户"</string>
@@ -1825,6 +1844,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"正在添加新用户…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"删除用户"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"删除"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"允许应用和内容"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限应用"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展开应用设置"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"此设置会影响这台平板电脑上的所有用户。"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"此设置会影响这部手机上的所有用户。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"更改语言"</string>
@@ -1835,4 +1857,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"照片 ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"小区广播"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"请选择要显示的紧急消息类型。"</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"允许应用和内容"</string>
+    <string name="user_rename" msgid="8523499513614655279">"重命名"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"返回"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"下一步"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"完成"</string>
 </resources>

diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 4cf46d5..a7f70da 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml

@@ -218,10 +218,12 @@
     <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="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-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a2a6754..71a540d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"一律執行掃描"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"允許 Google 的定位服務和其他應用程式掃描網路 (即使 Wi-Fi 已關閉)"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"為了提升定位精確度及用於其他用途，Google 和其他應用程式可能會掃描附近的 Wi-Fi 網路 (即使 Wi-Fi 連線功能已關閉)。如果您不想授予這項權限，可隨時前往 [進階] &gt; [掃描] 變更設定。"</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"應用程式可能會掃描附近的網路 (即使 Wi-Fi 連線功能已關閉)。如果您不想授予這項權限，可隨時前往 [進階] &gt; [掃描] 變更設定。"</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"不要再顯示"</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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"無"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟網路掃描功能 (即使 Wi-Fi 已關閉)，藉此提升定位精確度及用於其他用途。"\n\n"您要對所有需要執行掃描的應用程式允許這項要求嗎？"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"拒絕"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"連線"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"無法連線至網路"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"清除"</string>
@@ -883,10 +889,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>
-    <!-- no translation found for mvno_type (2543253857818336421) -->
-    <skip />
-    <!-- no translation found for mvno_match_data (4560671695220540466) -->
-    <skip />
+    <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>
@@ -1494,6 +1498,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"移除所有憑證"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"信任的憑證"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"顯示信任的 CA 憑證"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"畫出解鎖圖形"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您必須畫出解鎖圖形，才能確認安裝憑證。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1802,11 +1812,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"執行中"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"使用者"</string>
     <string name="user_you_section" msgid="6247838798859425408">"您"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"其他使用者"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"新增使用者"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"新增受限的使用者"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"受限的使用者只能存取您選取的應用程式和內容"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"新增信任的使用者"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"信任的使用者不會受到限制"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"使用中"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"非使用中"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"尚未設定"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"信任"</string>
+    <string name="user_limited" msgid="5344145255529624480">"受限"</string>
     <string name="user_owner" msgid="3879126011135546571">"擁有者"</string>
     <string name="user_nickname" msgid="5148818000228994488">"暱稱"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"新增使用者"</string>
@@ -1829,6 +1848,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"正在新增使用者…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"刪除使用者"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"刪除"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"允許應用程式和內容"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限的應用程式"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展開應用程式設定"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"這項設定會影響這台平板電腦的所有使用者。"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"這項設定會影響這支手機的所有使用者。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"變更語言"</string>
@@ -1839,4 +1861,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"相片 ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"區域廣播"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"選取要顯示的緊急警示類型。"</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"允許應用程式和內容"</string>
+    <string name="user_rename" msgid="8523499513614655279">"重新命名"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"返回"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"下一步"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"完成"</string>
 </resources>

diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index dff599f..605e32d 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml

@@ -218,10 +218,12 @@
     <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="mvno_type_entries">
+    <item msgid="4367119357633573465">"Lutho"</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">"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 f513934..852b51a 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -540,10 +540,13 @@
     <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) -->
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Ukuskena kuhlala njalo kutholakala"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Vumela isevisi yendawo ye-Google nezinye izinhlelo zokusebenza ukuthi ziskenele amanethiwekhi, noma ngabe i-Wi-Fi ivaliwe"</string>
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
     <skip />
-    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
-    <skip />
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Ukuthuthukisa ukulunga kwendawo nezinye izinjongo, i-Google nezinye izinhlelo zokusebenza zingaskenela amanethiwekhi aseduze, noma ngabe i-Wi-Fi ivaliwe. Uma ungafuni ukuthi lokhu kwenzeke, hamba ekuskeneni okuthuthukisiwe &gt; okuhlala kutholakala."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Izinhlelo zokusebenza zingaskenela amanethiwekhi aseduze, noma ngabe i-Wi-Fi ivaliwe. Uma ungafuni ukuthi lokhu kwenzeke, hamba ekuskeneni okuthuthukisiwe &gt; okuhlala kutholakala."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ungabonisi futhi"</string>
     <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>
@@ -605,6 +608,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"ivikelwe nge <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ivikelwe nge <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Lutho"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ukuze kuthuthukiswe ukufaneleka kwendawo nezinye izinjongo, i-<xliff:g id="APP_NAME">%1$s</xliff:g> ifuna ukuvula ukuskena kwenethiwekhi, noma ngabe i-Wi-Fi ivaliwe."\n\n"Vumela lokhu ngazo zonke izinhlelo zokusebenza ezifuna ukuskena?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Vumela"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Phika"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Xhuma kwi-inthanethi"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Yehlulekile ukuxhuma kunethiwekhi"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Khohlwa"</string>
@@ -884,10 +890,8 @@
     <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="mvno_type" msgid="2543253857818336421">"Uhlobo lwe-MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Inani le-MVNO"</string>
     <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>
@@ -1497,6 +1501,12 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Susa zonke izitifiketi"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Izifakazeli ezithenjwayo"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Bonisa izitifiketi ze-CA ezithenjwayo"</string>
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dweba iphethini yakho yokuvula"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Udinga ukudweba iphethini yakho yokuvula ukuze uqinisekise ukufakwa kwezincwadi ezichaza ngomuntu."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1805,11 +1815,20 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Ukuphoqelela"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Abasebenzisi"</string>
     <string name="user_you_section" msgid="6247838798859425408">"Wena"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Abanye abasebenzisi"</string>
+    <!-- no translation found for user_trusted_list_title (8841215084164687183) -->
+    <skip />
+    <!-- no translation found for user_limited_list_title (6492625072867292806) -->
+    <skip />
     <string name="user_add_user_menu" msgid="1675956975014862382">"Engeza umsebenzisi"</string>
+    <string name="user_add_restricted" msgid="2355584640156396901">"Engeza umsebenzisi okhawulelwe"</string>
+    <string name="user_add_restricted_summary" msgid="6627956758186349471">"Abasebenzisi abakhawulelwe bangafinyelela kuzinhlelo zokusebenza nokuqukethwe okukhethayo kuphela"</string>
+    <string name="user_add_trusted" msgid="557634297572871869">"Engeza umsebenzisi othenjiwe"</string>
+    <string name="user_add_trusted_summary" msgid="1118604533072902851">"Abasebenzisi abathenjiwe abanayo imikhawulo"</string>
     <string name="user_summary_active" msgid="4740649452346004418">"Kuyasebenza"</string>
     <string name="user_summary_inactive" msgid="3758296246095054572">"Akusebenzi"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Akukho ukusetha"</string>
+    <string name="user_trusted" msgid="6742122083463724471">"Othenjiwe"</string>
+    <string name="user_limited" msgid="5344145255529624480">"Okukhawulelwe"</string>
     <string name="user_owner" msgid="3879126011135546571">"Umnikazi"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Isidlaliso"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Engeza umsebenzisi omusha"</string>
@@ -1832,6 +1851,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"Ingeza umsebenzisi omusha…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Susa umsebenzisi"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Susa"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Vumela izinhlelo zokusebenza nokuqukethwe"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Izinhlelo zokusebenza ezinomkhawulo"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Nweba izilungiselelo zohlelo lokusebenza"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Lesi silungiselelo sithinta bonke abasebenzisi kule thebulethi."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Lesi silungiselelo sithinta bonke abasebenzisi kule foni."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Shintsha ulimi"</string>
@@ -1842,4 +1864,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"I-ID yesithombe"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Ukusakazwa kweselula"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Khetha izinhlobo zezaziso zesimo esiphuthumayo ongazibonisa."</string>
+    <string name="user_restrictions_title" msgid="371835484894400390">"Vumela izinhlelo zokusebenza nokuqukethwe"</string>
+    <string name="user_rename" msgid="8523499513614655279">"QAMBA KABUSHA"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Phindela emuva"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Okulandelayo"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Qeda"</string>
 </resources>

diff --git a/res/values/colors.xml b/res/values/colors.xml
index e7a00c3..bd385f6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml

@@ -37,4 +37,7 @@
     <color name="title_color">@android:color/holo_blue_light</color>
     <color name="setup_divider_color">#333333</color>
 
+    <color name="circle_avatar_frame_color">#ffffffff</color>
+    <color name="circle_avatar_frame_shadow_color">#80000000</color>
+    <color name="circle_avatar_frame_pressed_color">#ffffffff</color>
 </resources>

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 91f293c..759b407 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml

@@ -61,4 +61,8 @@
     <dimen name="keyguard_appwidget_picker_margin_left">6dip</dimen>
     <dimen name="keyguard_appwidget_picker_margin_right">6dip</dimen>
     <integer name="keyguard_appwidget_picker_cols">1</integer>
+
+    <dimen name="circle_avatar_size">48dp</dimen>
+    <dimen name="circle_avatar_frame_stroke_width">1dp</dimen>
+    <dimen name="circle_avatar_frame_shadow_radius">3dp</dimen>
 </resources>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4a8f796..573f4a0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -1274,6 +1274,8 @@
     <string name="wifi_scan_always_available">Scanning always available</string>
     <!-- Checkbox summary for option to toggle scan always available setting -->
     <string name="wifi_scan_always_available_summary">Let Google\'s location service and other apps scan for networks, even when Wi-Fi is off</string>
+    <!-- Preference title for option to install certificates -->
+    <string name="wifi_install_credentials">Install certificates</string>
     <string name="wifi_scan_notify_text_location_on">To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available.</string>
     <string name="wifi_scan_notify_text_location_off">Apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available.</string>
     <!-- Wifi scan always mode checkbox text -->
@@ -3522,6 +3524,12 @@
     <string name="trusted_credentials">Trusted credentials</string>
     <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
     <string name="trusted_credentials_summary">Display trusted CA certificates</string>
+    <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
+    <string name="credential_storage_type">Storage type</string>
+    <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
+    <string name="credential_storage_type_hardware">Hardware-backed</string>
+    <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
+    <string name="credential_storage_type_software">Software only</string>
 
     <!-- Message to draw an unlock pattern when installing credentials -->
     <string name="credentials_install_gesture_prompt">Draw your unlock pattern</string>
@@ -4276,8 +4284,10 @@
     <string name="user_settings_title">Users</string>
     <!-- User settings section title for details about you [CHAR LIMIT=25] -->
     <string name="user_you_section">You</string>
-    <!-- User settings user list section header [CHAR LIMIT=30] -->
-    <string name="user_list_title">Other users</string>
+    <!-- User settings trusted user list section header [CHAR LIMIT=30] -->
+    <string name="user_trusted_list_title">Trusted users</string>
+    <!-- User settings limited user list section header [CHAR LIMIT=30] -->
+    <string name="user_limited_list_title">Limited 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] -->
@@ -4412,6 +4422,27 @@
     <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>
+    <!-- Preference label for custom restrictions [CHAR LIMIT=35] -->
+    <string name="app_restrictions_custom_label">Set application limits</string>
+
+    <!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
+    <string name="restriction_wifi_config_title">Wi\u2011Fi and Mobile</string>
+    <!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
+    <string name="restriction_wifi_config_summary">Allow modification of Wi\u2011Fi and Mobile settings</string>
+    <!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
+    <string name="restriction_bluetooth_config_title">Bluetooth</string>
+    <!-- Restrictions summary for changing bluetooth configuration [CHAR LIMIT=100] -->
+    <string name="restriction_bluetooth_config_summary">Allow modification of Bluetooth pairings and settings</string>
+    <!-- Restrictions title for allowing NFC transfers [CHAR LIMIT=35] -->
+    <string name="restriction_nfc_enable_title">NFC</string>
+    <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+    <string name="restriction_nfc_enable_summary" product="tablet">Allow data exchange when the tablet touches another device</string>
+    <!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
+    <string name="restriction_nfc_enable_summary" product="default">Allow data exchange when the phone touches another device</string>
+    <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
+    <string name="restriction_location_enable_title">Location access</string>
+    <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
+    <string name="restriction_location_enable_summary" >Let apps use your location information</string>
 
     <!-- Wizard back button label [CHAR LIMIT=25] -->
     <string name="wizard_back">Back</string>

diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index ee87e51..10fc98f 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml

@@ -63,6 +63,11 @@
     <PreferenceCategory android:key="credentials_management"
             android:title="@string/credentials_title"
             android:persistent="false">
+        <Preference android:key="credential_storage_type"
+                android:title="@string/credential_storage_type"
+                style="?android:attr/preferenceInformationStyle"
+                android:persistent="false" />
+
         <Preference android:title="@string/trusted_credentials"
                 android:summary="@string/trusted_credentials_summary"
                 android:persistent="false"

diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index 3e61bd7..2e73e9e 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml

@@ -35,8 +35,8 @@
             android:fragment="com.android.settings.OwnerInfoSettings" />
 
     <PreferenceCategory
-            android:key="user_list"
-            android:title="@string/user_list_title">
+            android:key="limited_user_list"
+            android:title="@string/user_limited_list_title">
     </PreferenceCategory>
 
     <Preference
@@ -45,6 +45,11 @@
             android:summary="@string/user_add_restricted_summary"
             android:icon="@drawable/ic_menu_add" />
 
+    <PreferenceCategory
+            android:key="trusted_user_list"
+            android:title="@string/user_trusted_list_title">
+    </PreferenceCategory>
+
     <Preference
             android:key="user_add_trusted"
             android:title="@string/user_add_trusted"

diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index 4319ec6..d250585 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml

@@ -53,6 +53,11 @@
             android:entryValues="@array/wifi_frequency_band_values"
             />
 
+    <Preference
+            android:key="install_credentials"
+            android:title="@string/wifi_install_credentials"
+            android:persistent="false" />
+
     <CheckBoxPreference
             android:key="suspend_optimizations"
             android:title="@string/wifi_suspend_optimizations"

diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index c737c7d..1444a73 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java

@@ -197,12 +197,14 @@
             Bundle bundle = mInstallBundle;
             mInstallBundle = null;
 
+            final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, -1);
+
             if (bundle.containsKey(Credentials.EXTRA_USER_PRIVATE_KEY_NAME)) {
                 String key = bundle.getString(Credentials.EXTRA_USER_PRIVATE_KEY_NAME);
                 byte[] value = bundle.getByteArray(Credentials.EXTRA_USER_PRIVATE_KEY_DATA);
 
-                if (!mKeyStore.importKey(key, value)) {
-                    Log.e(TAG, "Failed to install " + key);
+                if (!mKeyStore.importKey(key, value, uid)) {
+                    Log.e(TAG, "Failed to install " + key + " as user " + uid);
                     return;
                 }
             }
@@ -211,8 +213,8 @@
                 String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME);
                 byte[] certData = bundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA);
 
-                if (!mKeyStore.put(certName, certData)) {
-                    Log.e(TAG, "Failed to install " + certName);
+                if (!mKeyStore.put(certName, certData, uid)) {
+                    Log.e(TAG, "Failed to install " + certName + " as user " + uid);
                     return;
                 }
             }
@@ -221,11 +223,10 @@
                 String caListName = bundle.getString(Credentials.EXTRA_CA_CERTIFICATES_NAME);
                 byte[] caListData = bundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA);
 
-                if (!mKeyStore.put(caListName, caListData)) {
-                    Log.e(TAG, "Failed to install " + caListName);
+                if (!mKeyStore.put(caListName, caListData, uid)) {
+                    Log.e(TAG, "Failed to install " + caListName + " as user " + uid);
                     return;
                 }
-
             }
 
             setResult(RESULT_OK);

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 0c00c68..2b2cc98 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java

@@ -77,7 +77,6 @@
 import android.net.NetworkStatsHistory;
 import android.net.NetworkTemplate;
 import android.net.TrafficStats;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.INetworkManagementService;
@@ -329,6 +328,7 @@
         mHeader = (ViewGroup) inflater.inflate(R.layout.data_usage_header, mListView, false);
         mHeader.setClickable(true);
 
+        mListView.addHeaderView(new View(context), null, true);
         mListView.addHeaderView(mHeader, null, true);
         mListView.setItemsCanFocus(true);
 
@@ -454,9 +454,9 @@
         mMenuDataRoaming.setChecked(getDataRoaming());
 
         mMenuRestrictBackground = menu.findItem(R.id.data_usage_menu_restrict_background);
-        mMenuRestrictBackground.setVisible(hasReadyMobileRadio(context) && !appDetailMode);
+        mMenuRestrictBackground.setVisible(
+                hasReadyMobileRadio(context) && isOwner && !appDetailMode);
         mMenuRestrictBackground.setChecked(mPolicyManager.getRestrictBackground());
-        mMenuRestrictBackground.setVisible(isOwner);
 
         mMenuAutoSync = menu.findItem(R.id.data_usage_menu_auto_sync);
         mMenuAutoSync.setChecked(ContentResolver.getMasterSyncAutomatically());
@@ -1745,6 +1745,9 @@
                     new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
+                            // clear focus to finish pending text edits
+                            cycleDayPicker.clearFocus();
+
                             final int cycleDay = cycleDayPicker.getValue();
                             final String cycleTimezone = new Time().timezone;
                             editor.setPolicyCycleDay(template, cycleDay, cycleTimezone);

diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index 310aae7..9cfb44d 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java

@@ -54,6 +54,7 @@
     DevicePolicyManager mDPM;
     final HashSet<ComponentName> mActiveAdmins = new HashSet<ComponentName>();
     final ArrayList<DeviceAdminInfo> mAvailableAdmins = new ArrayList<DeviceAdminInfo>();
+    String mDeviceOwnerPkg;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -70,6 +71,10 @@
     @Override
     public void onResume() {
         super.onResume();
+        mDeviceOwnerPkg = mDPM.getDeviceOwner();
+        if (mDeviceOwnerPkg != null && !mDPM.isDeviceOwner(mDeviceOwnerPkg)) {
+            mDeviceOwnerPkg = null;
+        }
         updateList();
     }
 
@@ -85,7 +90,7 @@
         mAvailableAdmins.clear();
         List<ResolveInfo> avail = getActivity().getPackageManager().queryBroadcastReceivers(
                 new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),
-                PackageManager.GET_META_DATA);
+                PackageManager.GET_META_DATA | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS);
         int count = avail == null ? 0 : avail.size();
         for (int i=0; i<count; i++) {
             ResolveInfo ri = avail.get(i);
@@ -149,7 +154,13 @@
         }
 
         public boolean isEnabled(int position) {
-            return true;
+            DeviceAdminInfo info = mAvailableAdmins.get(position);
+            if (mActiveAdmins.contains(info.getComponent())
+                    && info.getPackageName().equals(mDeviceOwnerPkg)) {
+                return false;
+            } else {
+                return true;
+            }
         }
 
         public View getView(int position, View convertView, ViewGroup parent) {
@@ -181,10 +192,16 @@
             vh.icon.setImageDrawable(item.loadIcon(activity.getPackageManager()));
             vh.name.setText(item.loadLabel(activity.getPackageManager()));
             vh.checkbox.setChecked(mActiveAdmins.contains(item.getComponent()));
+            final boolean activeOwner = vh.checkbox.isChecked()
+                    && item.getPackageName().equals(mDeviceOwnerPkg);
             try {
                 vh.description.setText(item.loadDescription(activity.getPackageManager()));
             } catch (Resources.NotFoundException e) {
             }
+            vh.checkbox.setEnabled(!activeOwner);
+            vh.name.setEnabled(!activeOwner);
+            vh.description.setEnabled(!activeOwner);
+            vh.icon.setEnabled(!activeOwner);
         }
     }
 }

diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/LocationSettings.java
index b73dccd..2edefdf 100644
--- a/src/com/android/settings/LocationSettings.java
+++ b/src/com/android/settings/LocationSettings.java

@@ -96,7 +96,7 @@
         // Only enable these controls if this user is allowed to change location
         // sharing settings.
         final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
-        boolean isToggleAllowed = um.isLocationSharingToggleAllowed();
+        boolean isToggleAllowed = !um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION);
         if (mLocationAccess != null) mLocationAccess.setEnabled(isToggleAllowed);
         if (mNetwork != null) mNetwork.setEnabled(isToggleAllowed);
         if (mGps != null) mGps.setEnabled(isToggleAllowed);
@@ -117,6 +117,7 @@
 
         if (mSettingsObserver == null) {
             mSettingsObserver = new Observer() {
+                @Override
                 public void update(Observable o, Object arg) {
                     updateLocationToggles();
                 }
@@ -131,13 +132,13 @@
         final ContentResolver cr = getContentResolver();
         final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
         if (preference == mNetwork) {
-            if (um.isLocationSharingToggleAllowed()) {
+            if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
                 Settings.Secure.setLocationProviderEnabled(cr,
                         LocationManager.NETWORK_PROVIDER, mNetwork.isChecked());
             }
         } else if (preference == mGps) {
             boolean enabled = mGps.isChecked();
-            if (um.isLocationSharingToggleAllowed()) {
+            if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
                 Settings.Secure.setLocationProviderEnabled(cr,
                         LocationManager.GPS_PROVIDER, enabled);
                 if (mAssistedGps != null) {
@@ -186,7 +187,7 @@
     /** Enable or disable all providers when the master toggle is changed. */
     private void onToggleLocationAccess(boolean checked) {
         final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
-        if (! um.isLocationSharingToggleAllowed()) {
+        if (um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
             return;
         }
         final ContentResolver cr = getContentResolver();

diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index 9bb6dca..21e717a 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java

@@ -67,7 +67,7 @@
             "^$|^[" + HC + "]+(\\-[" + HC + "]+)*(\\.[" + HC + "]+(\\-[" + HC + "]+)*)*$";
     private static final Pattern HOSTNAME_PATTERN;
     private static final String EXCLUSION_REGEXP =
-            "$|^[" + HC + "]+(\\-[" + HC + "]+)*(\\.[" + HC + "]+(\\-[" + HC + "]+)*)*$";
+            "$|^(\\*)?\\.?[" + HC + "]+(\\-[" + HC + "]+)*(\\.[" + HC + "]+(\\-[" + HC + "]+)*)*$";
     private static final Pattern EXCLUSION_PATTERN;
     static {
         HOSTNAME_PATTERN = Pattern.compile(HOSTNAME_REGEXP);

diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 954213d..56393e0 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java

@@ -115,7 +115,8 @@
             boolean muted = mAudioManager.isStreamMute(streamType);
 
             if (mCheckBoxes[i] != null) {
-                if ((streamType == AudioManager.STREAM_RING) &&
+                if (((streamType == AudioManager.STREAM_RING) ||
+                        (streamType == AudioManager.STREAM_NOTIFICATION)) &&
                         (mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE)) {
                     mCheckBoxes[i].setImageResource(
                             com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index b51f2f3..971a196 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java

@@ -73,6 +73,7 @@
     // Misc Settings
     private static final String KEY_SIM_LOCK = "sim_lock";
     private static final String KEY_SHOW_PASSWORD = "show_password";
+    private static final String KEY_CREDENTIAL_STORAGE_TYPE = "credential_storage_type";
     private static final String KEY_RESET_CREDENTIALS = "reset_credentials";
     private static final String KEY_TOGGLE_INSTALL_APPLICATIONS = "toggle_install_applications";
     private static final String KEY_TOGGLE_VERIFY_APPLICATIONS = "toggle_verify_applications";
@@ -91,6 +92,7 @@
 
     private CheckBoxPreference mShowPassword;
 
+    private KeyStore mKeyStore;
     private Preference mResetCredentials;
 
     private CheckBoxPreference mToggleAppInstallation;
@@ -231,15 +233,39 @@
 
         // Credential storage, only for primary user
         if (mIsPrimary) {
+            mKeyStore = KeyStore.getInstance();
+            Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE);
+
+            final int storageSummaryRes =
+                    mKeyStore.isHardwareBacked() ? R.string.credential_storage_type_hardware
+                            : R.string.credential_storage_type_software;
+            credentialStorageType.setSummary(storageSummaryRes);
+
             mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
         } else {
             removePreference(KEY_CREDENTIALS_MANAGER);
         }
 
+        PreferenceGroup deviceAdminCategory= (PreferenceGroup)
+                root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
         mToggleAppInstallation = (CheckBoxPreference) findPreference(
                 KEY_TOGGLE_INSTALL_APPLICATIONS);
         mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
 
+        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        boolean isSideloadingAllowed =
+                !um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
+        // Side loading of apps.
+        if (isSideloadingAllowed) {
+            mToggleAppInstallation.setEnabled(isSideloadingAllowed);
+        } else {
+            if (deviceAdminCategory != null) {
+                deviceAdminCategory.removePreference(mToggleAppInstallation);
+            } else {
+                mToggleAppInstallation.setEnabled(false);
+            }
+        }
+
         // Package verification, only visible to primary user and if enabled
         mToggleVerifyApps = (CheckBoxPreference) findPreference(KEY_TOGGLE_VERIFY_APPLICATIONS);
         if (mIsPrimary && showVerifierSetting()) {
@@ -250,8 +276,6 @@
                 mToggleVerifyApps.setEnabled(false);
             }
         } else {
-            PreferenceGroup deviceAdminCategory= (PreferenceGroup)
-                    root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
             if (deviceAdminCategory != null) {
                 deviceAdminCategory.removePreference(mToggleVerifyApps);
             } else {
@@ -268,6 +292,10 @@
     }
 
     private void setNonMarketAppsAllowed(boolean enabled) {
+        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        if (um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES)) {
+            return;
+        }
         // Change the system setting
         Settings.Global.putInt(getContentResolver(), Settings.Global.INSTALL_NON_MARKET_APPS,
                                 enabled ? 1 : 0);
@@ -303,6 +331,7 @@
                 .show();
     }
 
+    @Override
     public void onClick(DialogInterface dialog, int which) {
         if (dialog == mWarnInstallApps && which == DialogInterface.BUTTON_POSITIVE) {
             setNonMarketAppsAllowed(true);
@@ -408,8 +437,7 @@
         }
 
         if (mResetCredentials != null) {
-            KeyStore keyStore = KeyStore.getInstance();
-            mResetCredentials.setEnabled(!keyStore.isUnlocked());
+            mResetCredentials.setEnabled(!mKeyStore.isUnlocked());
         }
     }
 
@@ -505,6 +533,7 @@
         createPreferenceHierarchy();
     }
 
+    @Override
     public boolean onPreferenceChange(Preference preference, Object value) {
         if (preference == mLockAfter) {
             int timeout = Integer.parseInt((String) value);

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index be8e1cc..e29874b 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java

@@ -57,7 +57,6 @@
 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;
@@ -178,6 +177,7 @@
 
         if (mParentHeader != null) {
             setParentTitle(mParentHeader.title, null, new OnClickListener() {
+                @Override
                 public void onClick(View v) {
                     switchToParent(mParentHeader.fragment);
                 }
@@ -405,7 +405,6 @@
     @Override
     public void onBuildHeaders(List<Header> headers) {
         loadHeadersFromResource(R.xml.settings_headers, headers);
-
         updateHeaderList(headers);
     }
 
@@ -414,6 +413,8 @@
                 DevelopmentSettings.PREF_SHOW,
                 android.os.Build.TYPE.equals("eng"));
         int i = 0;
+
+        final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
         mHeaderIndexMap.clear();
         while (i < target.size()) {
             Header header = target.get(i);
@@ -455,14 +456,9 @@
                 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);
-                        }
-                    }
+            } else if (id == R.id.account_add) {
+                if (um.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS)) {
+                    target.remove(i);
                 }
             }
 
@@ -778,6 +774,7 @@
         return true;
     }
 
+    @Override
     public boolean shouldUpRecreateTask(Intent targetIntent) {
         return super.shouldUpRecreateTask(new Intent(this, Settings.class));
     }

diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 931858c..28d93f1 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java

@@ -145,6 +145,11 @@
             findPreference(KEY_RING_VOLUME).setDependency(null);
         }
 
+        if (getResources().getBoolean(com.android.internal.R.bool.config_useFixedVolume)) {
+            // device with fixed volume policy, do not display volumes submenu
+            getPreferenceScreen().removePreference(findPreference(KEY_RING_VOLUME));
+        }
+
         mVibrateWhenRinging = (CheckBoxPreference) findPreference(KEY_VIBRATE);
         mVibrateWhenRinging.setPersistent(false);
         mVibrateWhenRinging.setChecked(Settings.System.getInt(resolver,

diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index c346017..64c4d4a 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java

@@ -28,17 +28,16 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.SyncAdapterType;
 import android.content.SyncInfo;
 import android.content.SyncStatusInfo;
 import android.content.pm.ProviderInfo;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.text.TextUtils;
-import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -93,10 +92,12 @@
                 .setNegativeButton(android.R.string.cancel, null)
                 .setPositiveButton(R.string.remove_account_label,
                         new DialogInterface.OnClickListener() {
+                    @Override
                     public void onClick(DialogInterface dialog, int which) {
                         AccountManager.get(AccountSyncSettings.this.getActivity())
                                 .removeAccount(mAccount,
                                 new AccountManagerCallback<Boolean>() {
+                            @Override
                             public void run(AccountManagerFuture<Boolean> future) {
                                 // If already out of this screen, don't proceed.
                                 if (!AccountSyncSettings.this.isResumed()) {
@@ -233,12 +234,15 @@
         MenuItem syncCancel = menu.add(0, MENU_SYNC_CANCEL_ID, 0,
                 getString(R.string.sync_menu_sync_cancel))
                 .setIcon(com.android.internal.R.drawable.ic_menu_close_clear_cancel);
-        MenuItem removeAccount = menu.add(0, MENU_REMOVE_ACCOUNT_ID, 0,
-                getString(R.string.remove_account_label))
-                .setIcon(R.drawable.ic_menu_delete_holo_dark);
 
-        removeAccount.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
-                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
+        if (!um.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS)) {
+            MenuItem removeAccount = menu.add(0, MENU_REMOVE_ACCOUNT_ID, 0,
+                    getString(R.string.remove_account_label))
+                    .setIcon(R.drawable.ic_menu_delete_holo_dark);
+            removeAccount.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
+                    MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        }
         syncNow.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
         syncCancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |

diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index 6f7e29a..f1b7752 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java

@@ -23,8 +23,10 @@
 import android.accounts.OperationCanceledException;
 import android.app.Activity;
 import android.app.PendingIntent;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.util.Log;
 
 import com.android.settings.Utils;
@@ -71,7 +73,8 @@
 
     private PendingIntent mPendingIntent;
 
-    private AccountManagerCallback<Bundle> mCallback = new AccountManagerCallback<Bundle>() {
+    private final AccountManagerCallback<Bundle> mCallback = new AccountManagerCallback<Bundle>() {
+        @Override
         public void run(AccountManagerFuture<Bundle> future) {
             boolean done = true;
             try {
@@ -120,8 +123,10 @@
             if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "restored");
         }
 
-        if (mAddAccountCalled) {
+        final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
+        if (mAddAccountCalled || um.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS)) {
             // We already called add account - maybe the callback was lost.
+            // Or we aren't allowed to add an account.
             finish();
             return;
         }
@@ -162,6 +167,7 @@
         }
     }
 
+    @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putBoolean(KEY_ADD_CALLED, mAddAccountCalled);

diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index b669bac..d03f6dc 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java

@@ -33,6 +33,7 @@
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.UserManager;
 import android.os.storage.IMountService;
 import android.os.storage.StorageEventListener;
 import android.os.storage.StorageManager;
@@ -174,7 +175,10 @@
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         final MenuItem usb = menu.findItem(R.id.storage_usb);
-        usb.setVisible(!isMassStorageEnabled());
+        UserManager um = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
+        boolean usbItemVisible = !isMassStorageEnabled()
+                && !um.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);
+        usb.setVisible(usbItemVisible);
     }
 
     @Override

diff --git a/src/com/android/settings/deviceinfo/UsbSettings.java b/src/com/android/settings/deviceinfo/UsbSettings.java
index a836fb3..42de2fd 100644
--- a/src/com/android/settings/deviceinfo/UsbSettings.java
+++ b/src/com/android/settings/deviceinfo/UsbSettings.java

@@ -16,20 +16,16 @@
 
 package com.android.settings.deviceinfo;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.BroadcastReceiver;
-import android.content.ContentQueryMap;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.hardware.usb.UsbManager;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
-import android.provider.Settings;
 import android.util.Log;
 
 import com.android.settings.R;
@@ -73,6 +69,12 @@
         mMtp = (CheckBoxPreference)root.findPreference(KEY_MTP);
         mPtp = (CheckBoxPreference)root.findPreference(KEY_PTP);
 
+        UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        if (um.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER)) {
+            mMtp.setEnabled(false);
+            mPtp.setEnabled(false);
+        }
+
         return root;
     }
 
@@ -112,8 +114,12 @@
             mMtp.setChecked(false);
             mPtp.setChecked(false);
         }
-
-        if (!mUsbAccessoryMode) {
+        UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        if (um.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER)) {
+            Log.e(TAG, "USB is locked down");
+            mMtp.setEnabled(false);
+            mPtp.setEnabled(false);
+        } else if (!mUsbAccessoryMode) {
             //Enable MTP and PTP switch while USB is not in Accessory Mode, otherwise disable it
             Log.e(TAG, "USB Normal Mode");
             mMtp.setEnabled(true);
@@ -133,6 +139,12 @@
         if (Utils.isMonkeyRunning()) {
             return true;
         }
+        // If this user is disallowed from using USB, don't handle their attempts to change the
+        // setting.
+        UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        if (um.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER)) {
+            return true;
+        }
 
         String function = "none";
         if (preference == mMtp && mMtp.isChecked()) {

diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 9757f30..6154bdf 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java

@@ -16,18 +16,24 @@
 
 package com.android.settings.users;
 
+import android.appwidget.AppWidgetManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.RestrictionEntry;
+import android.content.pm.ApplicationInfo;
 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.Bitmap;
+import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.CheckBoxPreference;
@@ -82,11 +88,14 @@
     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;
 
+    private int mCustomRequestCode;
+    private HashMap<Integer, AppRestrictionsPreference> mCustomRequestMap =
+            new HashMap<Integer,AppRestrictionsPreference>();
+
     public static class Activity extends PreferenceActivity {
         @Override
         public Intent getIntent() {
@@ -130,7 +139,7 @@
         RestrictionEntry getRestriction(String key) {
             if (restrictions == null) return null;
             for (RestrictionEntry entry : restrictions) {
-                if (entry.key.equals(key)) {
+                if (entry.getKey().equals(key)) {
                     return entry;
                 }
             }
@@ -197,38 +206,77 @@
         }
         UserInfo info = mUserManager.getUserInfo(mUser.getIdentifier());
         mUserPreference.setTitle(info.name);
-        mUserPreference.setIcon(
-                new BitmapDrawable(mUserManager.getUserIcon(mUser.getIdentifier())));
+        Bitmap userIcon = mUserManager.getUserIcon(mUser.getIdentifier());
+        CircleFramedDrawable circularIcon =
+                CircleFramedDrawable.getInstance(this.getActivity(), userIcon);
+        mUserPreference.setIcon(circularIcon);
         mUserPreference.setText(info.name);
     }
 
+    private void addSystemApps(List<ApplicationInfo> visibleApps, Intent intent) {
+        final PackageManager pm = getActivity().getPackageManager();
+        List<ResolveInfo> launchableApps = pm.queryIntentActivities(intent, 0);
+        for (ResolveInfo app : launchableApps) {
+            if (app.activityInfo != null && app.activityInfo.applicationInfo != null) {
+                int flags = app.activityInfo.applicationInfo.flags;
+                if ((flags & ApplicationInfo.FLAG_SYSTEM) != 0
+                        || (flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
+                    // System app
+                    visibleApps.add(app.activityInfo.applicationInfo);
+                }
+            }
+        }
+    }
+
     private void populateApps() {
         mAppList.setOrderingAsAdded(false);
-
+        List<ApplicationInfo> visibleApps = new ArrayList<ApplicationInfo>();
         // TODO: Do this asynchronously since it can be a long operation
         final Context context = getActivity();
         PackageManager pm = context.getPackageManager();
+
+        // Add launchers
         Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
         launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
-        mApps = pm.queryIntentActivities(launcherIntent, 0);
-        Collections.sort(mApps, new AppLabelComparator(pm));
+        addSystemApps(visibleApps, launcherIntent);
 
+        // Add widgets
+        Intent widgetIntent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+        addSystemApps(visibleApps, widgetIntent);
+
+        List<ApplicationInfo> installedApps = pm.getInstalledApplications(0);
+        for (ApplicationInfo app : installedApps) {
+            if ((app.flags & ApplicationInfo.FLAG_SYSTEM) == 0
+                    && (app.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) == 0) {
+                // Downloaded app
+                visibleApps.add(app);
+            }
+        }
+        Collections.sort(visibleApps, new AppLabelComparator(pm));
+
+        for (int i = visibleApps.size() - 1; i > 1; i--) {
+            ApplicationInfo appInfo = visibleApps.get(i);
+            if (appInfo.packageName.equals(visibleApps.get(i-1).packageName)) {
+                visibleApps.remove(i);
+            }
+        }
         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;
+        if (visibleApps.size() > 0) {
+            for (ApplicationInfo app : visibleApps) {
+                if (app.packageName == null) continue;
+                String packageName = app.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.setSettingsEnabled(hasPackage(receivers, packageName)
+                        || packageName.equals(getActivity().getPackageName()));
                 p.setPersistent(false);
                 p.setOnPreferenceChangeListener(this);
                 p.setOnPreferenceClickListener(this);
@@ -256,7 +304,7 @@
         }
     }
 
-    private class AppLabelComparator implements Comparator<ResolveInfo> {
+    private class AppLabelComparator implements Comparator<ApplicationInfo> {
 
         PackageManager pm;
 
@@ -264,13 +312,13 @@
             this.pm = pm;
         }
 
-        private CharSequence getLabel(ResolveInfo info) {
+        private CharSequence getLabel(ApplicationInfo info) {
             // TODO: Optimize this with a cache
-            return info.activityInfo.loadLabel(pm);
+            return info.loadLabel(pm);
         }
 
         @Override
-        public int compare(ResolveInfo lhs, ResolveInfo rhs) {
+        public int compare(ApplicationInfo lhs, ApplicationInfo rhs) {
             String lhsLabel = getLabel(lhs).toString();
             String rhsLabel = getLabel(rhs).toString();
             return lhsLabel.compareTo(rhsLabel);
@@ -291,7 +339,7 @@
         if (v.getTag() instanceof AppRestrictionsPreference) {
             AppRestrictionsPreference pref = (AppRestrictionsPreference) v.getTag();
             if (v.getId() == R.id.app_restrictions_settings) {
-                handleSettingsClick(pref);
+                toggleAppPanel(pref);
             } else if (!pref.isRequired()) {
                 pref.setChecked(!pref.isChecked());
                 mSelectedPackages.put(pref.getKey().substring(PKG_PREFIX.length()),
@@ -312,21 +360,18 @@
             ArrayList<RestrictionEntry> restrictions = appPref.getRestrictions();
             if (restrictions != null) {
                 for (RestrictionEntry entry : restrictions) {
-                    if (entry.key.equals(restrictionKey)) {
-                        switch (entry.type) {
+                    if (entry.getKey().equals(restrictionKey)) {
+                        switch (entry.getType()) {
                         case RestrictionEntry.TYPE_BOOLEAN:
-                            entry.setValue((Boolean) newValue);
+                            entry.setSelectedState((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;
-                                }
-                            }
+                            entry.setSelectedString((String) newValue);
+                            String readable = findInArray(entry.getChoiceEntries(),
+                                    entry.getChoiceValues(), (String) newValue);
+                            listPref.setSummary(readable);
                             break;
                         case RestrictionEntry.TYPE_MULTI_SELECT:
                             MultiSelectListPreference msListPref =
@@ -334,13 +379,17 @@
                             Set<String> set = (Set<String>) newValue;
                             String [] selectedValues = new String[set.size()];
                             set.toArray(selectedValues);
-                            entry.setMultipleValues(selectedValues);
+                            entry.setAllSelectedStrings(selectedValues);
                             break;
                         default:
                             continue;
                         }
-                        mUserManager.setApplicationRestrictions(packageName, restrictions,
-                                mUser);
+                        if (packageName.equals(getActivity().getPackageName())) {
+                            RestrictionUtils.setRestrictions(getActivity(), restrictions, mUser);
+                        } else {
+                            mUserManager.setApplicationRestrictions(packageName, restrictions,
+                                    mUser);
+                        }
                         break;
                     }
                 }
@@ -355,7 +404,7 @@
         return true;
     }
 
-    private void handleSettingsClick(AppRestrictionsPreference preference) {
+    private void toggleAppPanel(AppRestrictionsPreference preference) {
         if (preference.getKey().startsWith(PKG_PREFIX)) {
             if (preference.panelOpen) {
                 for (Preference p : preference.childPreferences) {
@@ -364,14 +413,22 @@
                 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);
+                if (packageName.equals(getActivity().getPackageName())) {
+                    // Settings, fake it by using user restrictions
+                    ArrayList<RestrictionEntry> restrictions = RestrictionUtils.getRestrictions(
+                            getActivity(), mUser);
+                    onRestrictionsReceived(preference, packageName, restrictions);
+                } else {
+                    List<RestrictionEntry> oldEntries =
+                            mUserManager.getApplicationRestrictions(packageName, mUser);
+                    Intent intent = new Intent(Intent.ACTION_GET_RESTRICTION_ENTRIES);
+                    intent.setPackage(packageName);
+                    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;
         }
@@ -379,6 +436,7 @@
 
     class RestrictionsResultReceiver extends BroadcastReceiver {
 
+        private static final String CUSTOM_RESTRICTIONS_INTENT = Intent.EXTRA_RESTRICTIONS_INTENT;
         String packageName;
         AppRestrictionsPreference preference;
 
@@ -390,64 +448,144 @@
 
         @Override
         public void onReceive(Context context, Intent intent) {
-            ArrayList<RestrictionEntry> restrictions = getResultExtras(true).getParcelableArrayList(
+            Bundle results = getResultExtras(true);
+            final ArrayList<RestrictionEntry> restrictions = results.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:
+            Intent restrictionsIntent = (Intent) results.getParcelable(CUSTOM_RESTRICTIONS_INTENT);
+            if (restrictions != null && restrictionsIntent == null) {
+                onRestrictionsReceived(preference, packageName, restrictions);
+                mUserManager.setApplicationRestrictions(packageName, restrictions, mUser);
+            } else if (restrictionsIntent != null) {
+                final Intent customIntent = restrictionsIntent;
+                customIntent.putParcelableArrayListExtra(Intent.EXTRA_RESTRICTIONS, restrictions);
+                Preference p = new Preference(context);
+                p.setTitle(R.string.app_restrictions_custom_label);
+                p.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        int requestCode = generateCustomActivityRequestCode(
+                                RestrictionsResultReceiver.this.preference);
+                        AppRestrictionsFragment.this.startActivityForResult(
+                                customIntent, requestCode);
+                        return false;
                     }
-                    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++;
-                    }
-                }
+                });
+                p.setPersistent(false);
+                p.setOrder(preference.getOrder() + 1);
+                preference.childPreferences.add(p);
+                mAppList.addPreference(p);
                 preference.setRestrictions(restrictions);
             }
-            mUserManager.setApplicationRestrictions(packageName, restrictions, mUser);
         }
     }
 
+    private void onRestrictionsReceived(AppRestrictionsPreference preference, String packageName,
+            ArrayList<RestrictionEntry> restrictions) {
+        // Non-custom-activity case - expand the restrictions in-place
+        final Context context = preference.getContext();
+        int count = 1;
+        for (RestrictionEntry entry : restrictions) {
+            Preference p = null;
+            switch (entry.getType()) {
+            case RestrictionEntry.TYPE_BOOLEAN:
+                p = new CheckBoxPreference(context);
+                p.setTitle(entry.getTitle());
+                p.setSummary(entry.getDescription());
+                ((CheckBoxPreference)p).setChecked(entry.getSelectedState());
+                break;
+            case RestrictionEntry.TYPE_CHOICE:
+            case RestrictionEntry.TYPE_CHOICE_LEVEL:
+                p = new ListPreference(context);
+                p.setTitle(entry.getTitle());
+                String value = entry.getSelectedString();
+                if (value == null) {
+                    value = entry.getDescription();
+                }
+                p.setSummary(findInArray(entry.getChoiceEntries(), entry.getChoiceValues(),
+                        value));
+                ((ListPreference)p).setEntryValues(entry.getChoiceValues());
+                ((ListPreference)p).setEntries(entry.getChoiceEntries());
+                ((ListPreference)p).setValue(value);
+                break;
+            case RestrictionEntry.TYPE_MULTI_SELECT:
+                p = new MultiSelectListPreference(context);
+                p.setTitle(entry.getTitle());
+                ((MultiSelectListPreference)p).setEntryValues(entry.getChoiceValues());
+                ((MultiSelectListPreference)p).setEntries(entry.getChoiceEntries());
+                HashSet<String> set = new HashSet<String>();
+                for (String s : entry.getAllSelectedStrings()) {
+                    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.getKey());
+                mAppList.addPreference(p);
+                p.setOnPreferenceChangeListener(AppRestrictionsFragment.this);
+                preference.childPreferences.add(p);
+                count++;
+            }
+        }
+        preference.setRestrictions(restrictions);
+    }
+
+    /**
+     * Generates a request code that is stored in a map to retrieve the associated
+     * AppRestrictionsPreference.
+     * @param preference
+     * @return
+     */
+    private int generateCustomActivityRequestCode(AppRestrictionsPreference preference) {
+        mCustomRequestCode++;
+        mCustomRequestMap.put(mCustomRequestCode, preference);
+        return mCustomRequestCode;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        Log.i(TAG, "Got activity resultCode=" + resultCode + ", requestCode="
+                + requestCode + ", data=" + data);
+
+        AppRestrictionsPreference pref = mCustomRequestMap.get(requestCode);
+        if (pref == null) {
+            Log.w(TAG, "Unknown requestCode " + requestCode);
+            return;
+        }
+
+        if (resultCode == Activity.RESULT_OK) {
+            ArrayList<RestrictionEntry> list =
+                    data.getParcelableArrayListExtra(Intent.EXTRA_RESTRICTIONS);
+            if (list != null) {
+                // If there's a valid result, persist it to the user manager.
+                String packageName = pref.getKey().substring(PKG_PREFIX.length());
+                pref.setRestrictions(list);
+                mUserManager.setApplicationRestrictions(packageName, list, mUser);
+            }
+            toggleAppPanel(pref);
+        }
+        // Remove request from the map
+        mCustomRequestMap.remove(requestCode);
+    }
+
+    private String findInArray(String[] choiceEntries, String[] choiceValues,
+            String selectedString) {
+        for (int i = 0; i < choiceValues.length; i++) {
+            if (choiceValues[i].equals(selectedString)) {
+                return choiceEntries[i];
+            }
+        }
+        return selectedString;
+    }
+
     @Override
     public boolean onPreferenceClick(Preference preference) {
         if (preference.getKey().startsWith(PKG_PREFIX)) {

diff --git a/src/com/android/settings/users/CircleFramedDrawable.java b/src/com/android/settings/users/CircleFramedDrawable.java
new file mode 100644
index 0000000..7770b47
--- /dev/null
+++ b/src/com/android/settings/users/CircleFramedDrawable.java

@@ -0,0 +1,181 @@
+/*
+ * 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.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+
+import com.android.settings.R;
+
+/**
+ * Converts the user avatar icon to a circularly clipped one.
+ * TODO: Move this to an internal framework class and share with the one in Keyguard.
+ */
+class CircleFramedDrawable extends Drawable {
+
+    private final Bitmap mBitmap;
+    private final int mSize;
+    private final Paint mPaint;
+    private final float mShadowRadius;
+    private final float mStrokeWidth;
+    private final int mFrameColor;
+    private final int mHighlightColor;
+    private final int mFrameShadowColor;
+
+    private float mScale;
+    private Path mFramePath;
+    private Rect mSrcRect;
+    private RectF mDstRect;
+    private RectF mFrameRect;
+    private boolean mPressed;
+
+    public static CircleFramedDrawable getInstance(Context context, Bitmap icon) {
+        Resources res = context.getResources();
+        float iconSize = res.getDimension(R.dimen.circle_avatar_size);
+        float strokeWidth = res.getDimension(R.dimen.circle_avatar_frame_stroke_width);
+        float shadowRadius = res.getDimension(R.dimen.circle_avatar_frame_shadow_radius);
+        int frameColor = res.getColor(R.color.circle_avatar_frame_color);
+        int frameShadowColor = res.getColor(R.color.circle_avatar_frame_shadow_color);
+        int highlightColor = res.getColor(R.color.circle_avatar_frame_pressed_color);
+
+        CircleFramedDrawable instance = new CircleFramedDrawable(icon,
+                (int) iconSize, frameColor, strokeWidth, frameShadowColor, shadowRadius,
+                highlightColor);
+        return instance;
+    }
+
+    public CircleFramedDrawable(Bitmap icon, int size,
+            int frameColor, float strokeWidth,
+            int frameShadowColor, float shadowRadius,
+            int highlightColor) {
+        super();
+        mSize = size;
+        mShadowRadius = shadowRadius;
+        mFrameColor = frameColor;
+        mFrameShadowColor = frameShadowColor;
+        mStrokeWidth = strokeWidth;
+        mHighlightColor = highlightColor;
+
+        mBitmap = Bitmap.createBitmap(mSize, mSize, Bitmap.Config.ARGB_8888);
+        final Canvas canvas = new Canvas(mBitmap);
+
+        final int width = icon.getWidth();
+        final int height = icon.getHeight();
+        final int square = Math.min(width, height);
+
+        final Rect cropRect = new Rect((width - square) / 2, (height - square) / 2, square, square);
+        final RectF circleRect = new RectF(0f, 0f, mSize, mSize);
+        circleRect.inset(mStrokeWidth / 2f, mStrokeWidth / 2f);
+        circleRect.inset(mShadowRadius, mShadowRadius);
+
+        final Path fillPath = new Path();
+        fillPath.addArc(circleRect, 0f, 360f);
+
+        canvas.drawColor(0, PorterDuff.Mode.CLEAR);
+
+        // opaque circle matte
+        mPaint = new Paint();
+        mPaint.setAntiAlias(true);
+        mPaint.setColor(Color.BLACK);
+        mPaint.setStyle(Paint.Style.FILL);
+        canvas.drawPath(fillPath, mPaint);
+
+        // mask in the icon where the bitmap is opaque
+        mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_ATOP));
+        canvas.drawBitmap(icon, cropRect, circleRect, mPaint);
+
+        // prepare paint for frame drawing
+        mPaint.setXfermode(null);
+
+        mScale = 1f;
+
+        mSrcRect = new Rect(0, 0, mSize, mSize);
+        mDstRect = new RectF(0, 0, mSize, mSize);
+        mFrameRect = new RectF(mDstRect);
+        mFramePath = new Path();
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        // clear background
+        final float outside = Math.min(canvas.getWidth(), canvas.getHeight());
+        final float inside = mScale * outside;
+        final float pad = (outside - inside) / 2f;
+
+        mDstRect.set(pad, pad, outside - pad, outside - pad);
+        canvas.drawBitmap(mBitmap, mSrcRect, mDstRect, null);
+
+        mFrameRect.set(mDstRect);
+        mFrameRect.inset(mStrokeWidth / 2f, mStrokeWidth / 2f);
+        mFrameRect.inset(mShadowRadius, mShadowRadius);
+
+        mFramePath.reset();
+        mFramePath.addArc(mFrameRect, 0f, 360f);
+
+        // white frame
+        if (mPressed) {
+            mPaint.setStyle(Paint.Style.FILL);
+            mPaint.setColor(Color.argb((int) (0.33f * 255),
+                            Color.red(mHighlightColor),
+                            Color.green(mHighlightColor),
+                            Color.blue(mHighlightColor)));
+            canvas.drawPath(mFramePath, mPaint);
+        }
+        mPaint.setStrokeWidth(mStrokeWidth);
+        mPaint.setStyle(Paint.Style.STROKE);
+        mPaint.setColor(mPressed ? mHighlightColor : mFrameColor);
+        mPaint.setShadowLayer(mShadowRadius, 0f, 0f, mFrameShadowColor);
+        canvas.drawPath(mFramePath, mPaint);
+    }
+
+    public void setScale(float scale) {
+        mScale = scale;
+    }
+
+    public float getScale() {
+        return mScale;
+    }
+
+    public void setPressed(boolean pressed) {
+        mPressed = pressed;
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter cf) {
+    }
+}
\ No newline at end of file

diff --git a/src/com/android/settings/users/RestrictionUtils.java b/src/com/android/settings/users/RestrictionUtils.java
new file mode 100644
index 0000000..8b675a5
--- /dev/null
+++ b/src/com/android/settings/users/RestrictionUtils.java

@@ -0,0 +1,93 @@
+/*
+ * 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.Context;
+import android.content.RestrictionEntry;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings.Secure;
+
+import com.android.settings.R;
+
+import java.util.ArrayList;
+
+public class RestrictionUtils {
+
+    public static final String [] sRestrictionKeys = {
+        UserManager.DISALLOW_CONFIG_WIFI,
+        UserManager.DISALLOW_CONFIG_BLUETOOTH,
+        UserManager.DISALLOW_SHARE_LOCATION,
+        UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES
+    };
+
+    public static final int [] sRestrictionTitles = {
+        R.string.restriction_wifi_config_title,
+        R.string.restriction_bluetooth_config_title,
+        R.string.restriction_location_enable_title,
+        R.string.install_applications
+    };
+
+    public static final int [] sRestrictionDescriptions = {
+        R.string.restriction_wifi_config_summary,
+        R.string.restriction_bluetooth_config_summary,
+        R.string.restriction_location_enable_summary,
+        R.string.install_unknown_applications
+    };
+
+    /**
+     * Returns the current user restrictions in the form of application
+     * restriction entries.
+     * @return list of RestrictionEntry objects with user-visible text.
+     */
+    public static ArrayList<RestrictionEntry> getRestrictions(Context context, UserHandle user) {
+        Resources res = context.getResources();
+        ArrayList<RestrictionEntry> entries = new ArrayList<RestrictionEntry>();
+        UserManager um = UserManager.get(context);
+        Bundle userRestrictions = um.getUserRestrictions(user);
+
+        for (int i = 0; i < sRestrictionKeys.length; i++) {
+            RestrictionEntry entry = new RestrictionEntry(
+                    sRestrictionKeys[i],
+                    !userRestrictions.getBoolean(sRestrictionKeys[i], false));
+            entry.setTitle(res.getString(sRestrictionTitles[i]));
+            entry.setDescription(res.getString(sRestrictionDescriptions[i]));
+            entry.setType(RestrictionEntry.TYPE_BOOLEAN);
+            entries.add(entry);
+        }
+
+        return entries;
+    }
+
+    public static void setRestrictions(Context context, ArrayList<RestrictionEntry> entries,
+            UserHandle user) {
+        UserManager um = UserManager.get(context);
+        Bundle userRestrictions = um.getUserRestrictions(user);
+
+        for (RestrictionEntry entry : entries) {
+            userRestrictions.putBoolean(entry.getKey(), !entry.getSelectedState());
+            if (entry.getKey().equals(UserManager.DISALLOW_SHARE_LOCATION)
+                    && !entry.getSelectedState()) {
+                Secure.putStringForUser(context.getContentResolver(),
+                        Secure.LOCATION_PROVIDERS_ALLOWED, "", user.getIdentifier());
+            }
+        }
+        um.setUserRestrictions(userRestrictions, user);
+    }
+}

diff --git a/src/com/android/settings/users/RestrictionsReceiver.java b/src/com/android/settings/users/RestrictionsReceiver.java
deleted file mode 100644
index 0eeb7cd..0000000
--- a/src/com/android/settings/users/RestrictionsReceiver.java
+++ /dev/null

@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.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 6889747..2894bf9 100644
--- a/src/com/android/settings/users/UserPreference.java
+++ b/src/com/android/settings/users/UserPreference.java

@@ -57,7 +57,7 @@
             mRestricted = ((UserManager) getContext().getSystemService(Context.USER_SERVICE))
                     .getUserInfo(mUserId).isRestricted();
         }
-        setSummary(mRestricted ? R.string.user_limited : R.string.user_trusted);
+        //setSummary(mRestricted ? R.string.user_limited : R.string.user_trusted);
     }
 
     @Override

diff --git a/src/com/android/settings/users/UserRestrictionsActivity.java b/src/com/android/settings/users/UserRestrictionsActivity.java
index 5f377f3..1a90a81 100644
--- a/src/com/android/settings/users/UserRestrictionsActivity.java
+++ b/src/com/android/settings/users/UserRestrictionsActivity.java

@@ -76,7 +76,7 @@
         if (userId == -1) {
             mNewUser = true;
             mUserInfo = um.createUser(name, UserInfo.FLAG_RESTRICTED);
-            um.setUserRestriction(UserManager.ALLOW_MODIFY_ACCOUNTS, false,
+            um.setUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS, true,
                     new UserHandle(mUserInfo.id));
 
             Bitmap bitmap = BitmapFactory.decodeResource(getResources(),

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index b6385c8..5830184 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java

@@ -31,6 +31,7 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
@@ -76,7 +77,8 @@
     private static final String SAVE_ADDING_USER = "adding_user";
 
     private static final String KEY_USER_NICKNAME = "user_nickname";
-    private static final String KEY_USER_LIST = "user_list";
+    private static final String KEY_TRUSTED_USER_LIST = "trusted_user_list";
+    private static final String KEY_LIMITED_USER_LIST = "limited_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";
@@ -106,7 +108,8 @@
         R.drawable.avatar_default_8
     };
 
-    private PreferenceGroup mUserListCategory;
+    private PreferenceGroup mTrustedUserListCategory;
+    private PreferenceGroup mLimitedUserListCategory;
     private Preference mMePreference;
     private SelectableEditTextPreference mNicknamePreference;
     private Preference mAddRestrictedUser;
@@ -118,7 +121,7 @@
 
     private final Object mUserLock = new Object();
     private UserManager mUserManager;
-    private SparseArray<Drawable> mUserIcons = new SparseArray<Drawable>();
+    private SparseArray<Bitmap> mUserIcons = new SparseArray<Bitmap>();
     private boolean mIsOwner = UserHandle.myUserId() == UserHandle.USER_OWNER;
 
 
@@ -166,7 +169,8 @@
 
         mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
         addPreferencesFromResource(R.xml.user_settings);
-        mUserListCategory = (PreferenceGroup) findPreference(KEY_USER_LIST);
+        mTrustedUserListCategory = (PreferenceGroup) findPreference(KEY_TRUSTED_USER_LIST);
+        mLimitedUserListCategory = (PreferenceGroup) findPreference(KEY_LIMITED_USER_LIST);
         mMePreference = (Preference) findPreference(KEY_USER_ME);
         mMePreference.setOnPreferenceClickListener(this);
         if (!mIsOwner) {
@@ -269,9 +273,8 @@
         int myUserId = UserHandle.myUserId();
         Bitmap b = mUserManager.getUserIcon(myUserId);
         if (b != null) {
-            Drawable d = new BitmapDrawable(b);
-            mMePreference.setIcon(d);
-            mUserIcons.put(myUserId, d);
+            mMePreference.setIcon(encircle(b));
+            mUserIcons.put(myUserId, b);
         }
     }
 
@@ -441,8 +444,10 @@
         if (getActivity() == null) return;
         List<UserInfo> users = mUserManager.getUsers(true);
 
-        mUserListCategory.removeAll();
-        mUserListCategory.setOrderingAsAdded(false);
+        mTrustedUserListCategory.removeAll();
+        mTrustedUserListCategory.setOrderingAsAdded(false);
+        mLimitedUserListCategory.removeAll();
+        mLimitedUserListCategory.setOrderingAsAdded(false);
 
         final ArrayList<Integer> missingIcons = new ArrayList<Integer>();
         for (UserInfo user : users) {
@@ -456,19 +461,23 @@
                         UserHandle.myUserId() == UserHandle.USER_OWNER, this, this);
                 pref.setOnPreferenceClickListener(this);
                 pref.setKey("id=" + user.id);
-                mUserListCategory.addPreference(pref);
+                if (user.isRestricted()) {
+                    mLimitedUserListCategory.addPreference(pref);
+                } else {
+                    mTrustedUserListCategory.addPreference(pref);
+                }
                 if (user.id == UserHandle.USER_OWNER) {
                     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) {
                     missingIcons.add(user.id);
-                    pref.setIcon(R.drawable.avatar_default_1);
+                    pref.setIcon(encircle(R.drawable.avatar_default_1));
                 } else {
                     setPhotoId(pref, user);
                 }
@@ -480,9 +489,8 @@
                     false, null, null);
             pref.setEnabled(false);
             pref.setTitle(R.string.user_new_user_name);
-            //pref.setSummary(R.string.user_adding_new_user);
-            pref.setIcon(R.drawable.avatar_default_1);
-            mUserListCategory.addPreference(pref);
+            pref.setIcon(encircle(R.drawable.avatar_default_1));
+            mTrustedUserListCategory.addPreference(pref);
         }
         getActivity().invalidateOptionsMenu();
 
@@ -490,6 +498,15 @@
         if (missingIcons.size() > 0) {
             loadIconsAsync(missingIcons);
         }
+        boolean moreUsers = mUserManager.getMaxSupportedUsers() > users.size();
+        mAddRestrictedUser.setEnabled(moreUsers);
+        mAddTrustedUser.setEnabled(moreUsers);
+        // Remove the limited users category if there aren't other limited users.
+        if (!mIsOwner) {
+            if (mLimitedUserListCategory.getPreferenceCount() == 0) {
+                removePreference(KEY_LIMITED_USER_LIST);
+            }
+        }
     }
 
     private void loadIconsAsync(List<Integer> missingIcons) {
@@ -504,8 +521,7 @@
             protected Void doInBackground(List<Integer>... values) {
                 for (int userId : values[0]) {
                     Bitmap bitmap = mUserManager.getUserIcon(userId);
-                    Drawable d = new BitmapDrawable(resources, bitmap);
-                    mUserIcons.append(userId, d);
+                    mUserIcons.append(userId, bitmap);
                 }
                 return null;
             }
@@ -533,9 +549,9 @@
     }
 
     private void setPhotoId(Preference pref, UserInfo user) {
-        Drawable d = mUserIcons.get(user.id); // UserUtils.getUserIcon(mUserManager, user);
-        if (d != null) {
-            pref.setIcon(d);
+        Bitmap bitmap = mUserIcons.get(user.id); // UserUtils.getUserIcon(mUserManager, user);
+        if (bitmap != null) {
+            pref.setIcon(encircle(bitmap));
         }
     }
 
@@ -591,6 +607,16 @@
         return (user.flags & UserInfo.FLAG_INITIALIZED) != 0;
     }
 
+    private Drawable encircle(int iconResId) {
+        Bitmap icon = BitmapFactory.decodeResource(getResources(), iconResId);
+        return encircle(icon);
+    }
+
+    private Drawable encircle(Bitmap icon) {
+        Drawable circled = CircleFramedDrawable.getInstance(getActivity(), icon);
+        return circled;
+    }
+
     @Override
     public void onClick(View v) {
         if (v.getTag() instanceof UserPreference) {

diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index ac9df9f..5d581d8 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java

@@ -541,7 +541,7 @@
                 protected Boolean doInBackground(Void... args) {
                     final UserManager um =
                             (UserManager) context.getSystemService(Context.USER_SERVICE);
-                    if (um.isLocationSharingToggleAllowed()) {
+                    if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
                         Settings.Secure.setLocationProviderEnabled(
                             resolver,
                             LocationManager.GPS_PROVIDER,

diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index abe153f..7663058 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java

@@ -17,6 +17,7 @@
 package com.android.settings.wifi;
 
 import android.content.Context;
+import android.content.Intent;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiWatchdogStateMachine;
@@ -27,6 +28,7 @@
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.provider.Settings.Global;
+import android.security.Credentials;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -46,6 +48,7 @@
     private static final String KEY_SLEEP_POLICY = "sleep_policy";
     private static final String KEY_POOR_NETWORK_DETECTION = "wifi_poor_network_detection";
     private static final String KEY_SCAN_ALWAYS_AVAILABLE = "wifi_scan_always_available";
+    private static final String KEY_INSTALL_CREDENTIALS = "install_credentials";
     private static final String KEY_SUSPEND_OPTIMIZATIONS = "suspend_optimizations";
 
     private WifiManager mWifiManager;
@@ -94,6 +97,13 @@
         scanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(),
                     Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1);
 
+        Intent intent=new Intent(Credentials.INSTALL_AS_USER_ACTION);
+        intent.setClassName("com.android.certinstaller",
+                "com.android.certinstaller.CertInstallerMain");
+        intent.putExtra(Credentials.EXTRA_INSTALL_AS_UID, android.os.Process.WIFI_UID);
+        Preference pref = findPreference(KEY_INSTALL_CREDENTIALS);
+        pref.setIntent(intent);
+
         CheckBoxPreference suspendOptimizations =
             (CheckBoxPreference) findPreference(KEY_SUSPEND_OPTIMIZATIONS);
         suspendOptimizations.setChecked(Global.getInt(getContentResolver(),

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 497bce9..587197b 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java

@@ -819,7 +819,7 @@
     private void loadCertificates(Spinner spinner, String prefix) {
         final Context context = mConfigUi.getContext();
 
-        String[] certs = KeyStore.getInstance().saw(prefix);
+        String[] certs = KeyStore.getInstance().saw(prefix, android.os.Process.WIFI_UID);
         if (certs == null || certs.length == 0) {
             certs = new String[] {unspecifiedCert};
         } else {

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 4b2a0c9..cf27dd5 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java

@@ -953,7 +953,9 @@
         if (button == WifiDialog.BUTTON_FORGET && mSelectedAccessPoint != null) {
             forget();
         } else if (button == WifiDialog.BUTTON_SUBMIT) {
-            submit(mDialog.getController());
+            if (mDialog != null) {
+                submit(mDialog.getController());
+            }
         }
     }
commit	58f9cbd6774741d7fffbddbd06f2c0bf1fdf2e66	[log] [tgz]
author	Robert Greenwalt <rgreenwalt@google.com>	Tue Apr 02 19:20:12 2013 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Tue Apr 02 19:20:13 2013 +0000
tree	c0dbc50a6f32627a4273700916d25a7002b1358c
parent	1c541aec2be937f3ba6b1530551c16435d0eafc6 [diff]
parent	cd1cb16bad2686990014430197cf7cdd56190c86 [diff]