Merge "Remove Auto-rotate screen setting if a required feature is missing."
diff --git a/Android.mk b/Android.mk
index c8b81dc..0663e85 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_JAVA_LIBRARIES := bouncycastle telephony-common
+LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
 
 LOCAL_MODULE_TAGS := optional
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 59b562d..cf9739c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -262,7 +262,8 @@
         <activity android:name="ApnSettings"
                 android:label="@string/apn_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:launchMode="singleTask">
+                android:launchMode="singleTask"
+                android:parentActivityName="Settings$WirelessSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APN_SETTINGS" />
@@ -511,7 +512,7 @@
         </receiver>
 
         <activity android:name="Settings$UserDictionarySettingsActivity"
-                android:label="@string/user_dict_settings_titlebar"
+                android:label="@string/user_dict_settings_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
@@ -531,7 +532,7 @@
         </activity>
 
         <activity android:name=".inputmethod.UserDictionaryAddWordActivity"
-                  android:label="@string/user_dict_settings_titlebar"
+                  android:label="@string/user_dict_settings_title"
                   android:theme="@android:style/Theme.Holo.Dialog.NoActionBar"
                   android:windowSoftInputMode="stateVisible"
                   android:noHistory="true"
@@ -546,7 +547,7 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="UserDictionarySettings"
-                android:label="@string/user_dict_settings_titlebar"
+                android:label="@string/user_dict_settings_title"
                 android:exported="true"
                 android:targetActivity="Settings$UserDictionarySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -802,10 +803,8 @@
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APP_OPS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <!-- Not yet ready to expose.
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
-                -->
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.AppOpsSummary" />
@@ -1202,15 +1201,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".wifi.WifiNotifyScanModeActivity"
-                  android:excludeFromRecents="true"
-                  android:theme="@style/Transparent">
-            <intent-filter>
-                <action android:name="android.net.wifi.action.NOTIFY_SCAN_ALWAYS_AVAILABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <activity android:name=".bluetooth.RequestPermissionHelperActivity"
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index 1643cab..2af1ba9 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -51,26 +51,34 @@
 
         <!-- Used for the media volume -->
         <LinearLayout
+                android:id="@+id/media_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="8dip"
-                android:orientation="horizontal"
-                android:gravity="center_vertical">
+                android:orientation="vertical">
 
-                <ImageView android:id="@+id/media_mute_button"
-                        android:layout_width="wrap_content"
+                <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:padding="16dip"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:contentDescription="@string/volume_media_mute"
-                    />
+                        android:paddingStart="8dip"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical">
 
-                <SeekBar android:id="@+id/media_volume_seekbar"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:paddingTop="2dip"
-                        android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
+                        <ImageView android:id="@+id/media_mute_button"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:padding="16dip"
+                                android:background="?android:attr/selectableItemBackground"
+                                android:contentDescription="@string/volume_media_mute"
+                            />
+
+                        <SeekBar android:id="@+id/media_volume_seekbar"
+                                android:layout_width="0dip"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:paddingTop="2dip"
+                                android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
+                </LinearLayout>
+
         </LinearLayout>
 
         <!-- Used for the ringer/notification volume -->
@@ -159,36 +167,45 @@
 
         </LinearLayout>
 
-        <TextView
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dip"
-                android:paddingStart="16dip"
-                android:layout_gravity="start"
-                android:text="@string/volume_alarm_description"
-            />
-
         <!-- Used for the alarm volume -->
         <LinearLayout
+                android:id="@+id/alarm_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="8dip"
-                android:orientation="horizontal"
-                android:gravity="center_vertical">
+                android:orientation="vertical">
 
-                <ImageView android:id="@+id/alarm_mute_button"
+                <TextView
+                        android:textAppearance="?android:attr/textAppearanceSmall"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:padding="16dip"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:contentDescription="@string/volume_alarm_mute" />
-                <SeekBar android:id="@+id/alarm_volume_seekbar"
-                        android:layout_width="0dip"
+                        android:layout_marginTop="16dip"
+                        android:paddingStart="16dip"
+                        android:layout_gravity="start"
+                        android:text="@string/volume_alarm_description"
+                    />
+
+                <!-- Used for the alarm volume -->
+                <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:paddingTop="2dip"
-                        android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
+                        android:paddingStart="8dip"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical">
+
+                        <ImageView android:id="@+id/alarm_mute_button"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:padding="16dip"
+                                android:background="?android:attr/selectableItemBackground"
+                                android:contentDescription="@string/volume_alarm_mute" />
+                        <SeekBar android:id="@+id/alarm_volume_seekbar"
+                                android:layout_width="0dip"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:paddingTop="2dip"
+                                android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
+                </LinearLayout>
+
         </LinearLayout>
 
     </LinearLayout>
diff --git a/res/layout/preference_user_delete_widget.xml b/res/layout/preference_user_delete_widget.xml
index 6ee6faa..7d563f8 100644
--- a/res/layout/preference_user_delete_widget.xml
+++ b/res/layout/preference_user_delete_widget.xml
@@ -34,7 +34,7 @@
         android:paddingStart="16dip"
         android:paddingEnd="16dip"
         android:src="@drawable/ic_sysbar_quicksettings"
-        android:contentDescription="@string/user_delete_user_description"
+        android:contentDescription="@string/settings_label"
         android:layout_gravity="center"
         android:background="?android:attr/selectableItemBackground" />
     <View
diff --git a/res/layout/two_line_list_item.xml b/res/layout/two_line_list_item.xml
index 86392b6..e6a7c2b 100644
--- a/res/layout/two_line_list_item.xml
+++ b/res/layout/two_line_list_item.xml
@@ -16,7 +16,8 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingStart="16dip"
     android:paddingEnd="16dip"
     android:paddingTop="8dip"
diff --git a/res/layout/user_dictionary_add_word_fullscreen.xml b/res/layout/user_dictionary_add_word_fullscreen.xml
index b72886f..57f9184 100644
--- a/res/layout/user_dictionary_add_word_fullscreen.xml
+++ b/res/layout/user_dictionary_add_word_fullscreen.xml
@@ -14,63 +14,70 @@
      limitations under the License.
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/user_dict_settings_add_dialog_top"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
+    android:id="@+id/user_dict_settings_add_dialog_top"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
 
-  <TextView
-     android:layout_height="wrap_content"
-     android:layout_width="match_parent"
-     android:text="@string/user_dict_settings_add_screen_title"
-     style="?android:attr/listSeparatorTextViewStyle" />
+    <EditText
+        android:id="@+id/user_dictionary_add_word_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="fill_horizontal|center_vertical"
+        android:layout_marginBottom="8dip"
+        android:layout_marginStart="8dip"
+        android:layout_marginTop="8dip"
+        android:hint="@string/user_dict_settings_add_word_hint"
+        android:imeOptions="flagNoFullscreen"
+        android:inputType="textNoSuggestions"
+        android:maxLength="@integer/maximum_user_dictionary_word_length" >
 
-  <EditText android:id="@+id/user_dictionary_add_word_text"
-            android:maxLength="@integer/maximum_user_dictionary_word_length"
+        <requestFocus />
+    </EditText>
+
+    <GridLayout
+        android:id="@+id/user_dictionary_add_word_grid"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dip"
+        android:layout_marginStart="8dip"
+        android:columnCount="2" >
+
+        <TextView
+            android:id="@+id/user_dictionary_add_shortcut_label"
+            style="?android:attr/textAppearanceSmall"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent"
+            android:layout_gravity="start|center_vertical"
+            android:text="@string/user_dict_settings_add_shortcut_option_name" />
+
+        <EditText
+            android:id="@+id/user_dictionary_add_shortcut"
+            android:layout_width="wrap_content"
             android:layout_gravity="fill_horizontal|center_vertical"
-            android:layout_marginStart="8dip"
             android:layout_marginBottom="8dip"
+            android:layout_marginStart="8dip"
             android:layout_marginTop="8dip"
-            android:hint="@string/user_dict_settings_add_word_hint"
+            android:hint="@string/user_dict_settings_add_shortcut_hint"
+            android:imeOptions="flagNoFullscreen"
             android:inputType="textNoSuggestions"
-            android:imeOptions="flagNoFullscreen">
-    <requestFocus />
-  </EditText>
-  <GridLayout android:id="@+id/user_dictionary_add_word_grid"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_marginStart="8dip"
-              android:layout_marginEnd="8dip"
-              android:columnCount="2">
-    <TextView android:id="@+id/user_dictionary_add_shortcut_label"
-              style="?android:attr/textAppearanceSmall"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="start|center_vertical"
-              android:text="@string/user_dict_settings_add_shortcut_option_name" />
-    <EditText android:id="@+id/user_dictionary_add_shortcut"
-              android:maxLength="@integer/maximum_user_dictionary_word_length"
-              android:layout_width="wrap_content"
-              android:layout_gravity="fill_horizontal|center_vertical"
-              android:layout_marginStart="8dip"
-              android:layout_marginBottom="8dip"
-              android:layout_marginTop="8dip"
-              android:hint="@string/user_dict_settings_add_shortcut_hint"
-              android:inputType="textNoSuggestions"
-              android:imeOptions="flagNoFullscreen" />
-    <TextView android:id="@+id/user_dictionary_add_locale_label"
-              style="?android:attr/textAppearanceSmall"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="start|center_vertical"
-              android:text="@string/user_dict_settings_add_locale_option_name" />
-    <Spinner  android:id="@+id/user_dictionary_add_locale"
-              android:layout_marginStart="8dip"
-              android:layout_marginBottom="8dip"
-              android:layout_marginTop="8dip"
-              android:layout_width="wrap_content"
-              android:layout_gravity="fill_horizontal|center_vertical" />
+            android:maxLength="@integer/maximum_user_dictionary_word_length" />
+
+        <TextView
+            android:id="@+id/user_dictionary_add_locale_label"
+            style="?android:attr/textAppearanceSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:text="@string/user_dict_settings_add_locale_option_name" />
+
+        <Spinner
+            android:id="@+id/user_dictionary_add_locale"
+            android:layout_width="wrap_content"
+            android:layout_gravity="fill_horizontal|center_vertical"
+            android:layout_marginBottom="8dip"
+            android:layout_marginStart="8dip"
+            android:layout_marginTop="8dip" />
     </GridLayout>
+
 </LinearLayout>
diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml
index 506dd2e2..c698eaf 100644
--- a/res/layout/user_info_header.xml
+++ b/res/layout/user_info_header.xml
@@ -79,6 +79,14 @@
                 android:text="@string/user_summary_restricted_profile"
                 android:maxLines="4" />
         </RelativeLayout>
+        <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:paddingStart="16dip"
+                android:paddingEnd="16dip"
+                android:src="@drawable/ic_sysbar_quicksettings"
+                android:contentDescription="@string/settings_label"
+                android:layout_gravity="center"/>
     </LinearLayout>
     <View android:layout_width="match_parent"
           android:layout_height="2dp"
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index d688c58..475b19a 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Ligging"</item>
     <item msgid="255608127647030286">"Persoonlik"</item>
     <item msgid="4588829735729884491">"Boodskappe"</item>
-    <item msgid="8971765125227378270">"Toestel"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Toestel"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"growwe ligging"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"speel oudio"</item>
     <item msgid="8374996688066472414">"lees knipbord"</item>
     <item msgid="3045529469061083747">"verander knipbord"</item>
+    <item msgid="5124443975763747838">"mediaknoppies"</item>
+    <item msgid="4547883971364273343">"klankfokus"</item>
+    <item msgid="2603878814882344450">"meestervolume"</item>
+    <item msgid="7136963238377062018">"stemvolume"</item>
+    <item msgid="4270236897655923007">"lui-volume"</item>
+    <item msgid="6325739889222559394">"mediavolume"</item>
+    <item msgid="5762123934816216821">"wekkervolume"</item>
+    <item msgid="785049718065337473">"kennisgewingvolume"</item>
+    <item msgid="6700305533746877052">"bluetoothvolume"</item>
+    <item msgid="2029227495214047094">"hou wakker"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ligging"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Speel oudio"</item>
     <item msgid="136815868796597058">"Lees knipbord"</item>
     <item msgid="5238692940326972503">"Verander knipbord"</item>
+    <item msgid="5753789168376302997">"Mediaknoppies"</item>
+    <item msgid="3265262911688671938">"Oudiofokus"</item>
+    <item msgid="2098976479485046797">"Meestervolume"</item>
+    <item msgid="5660213838861789350">"Stemvolume"</item>
+    <item msgid="7983336752371254444">"Luivolume"</item>
+    <item msgid="7878027809189330917">"Mediavolume"</item>
+    <item msgid="7260546305036218513">"Wekkervolume"</item>
+    <item msgid="9103719301075748925">"Kennisgewingvolume"</item>
+    <item msgid="7025966722295861512">"Bluetoothvolume"</item>
+    <item msgid="4665183401128289653">"Hou wakker"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Op skerm as reëls"</item>
     <item msgid="120512413928262547">"In adb-dop dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Af"</item>
+    <item msgid="7688197031296835369">"Wys oortrekareas"</item>
+    <item msgid="8332661909019981149">"Wys oortrektoonbank"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen agtergrondprosesse"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 6351423..0cfc62b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Voer teks in om op die sluitskerm te wys"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Wys gebruikerinligting op sluitskerm"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Gebruikerinligting"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Wys profiel-inligting op slotskerm"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiel-inligting"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Liggingstoegang"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sekuriteit"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Stel my ligging, ontsluit skerm, sluit SIM-kaart, eiebewys sluit"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Wysig netwerk"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Om beskikbare netwerke te sien, skakel Wi-Fi aan."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Soek tans vir Wi-Fi-netwerke…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Jy het nie toestemming om die Wi-Fi-netwerk te verander nie."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Ander netwerk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Nog"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Outomatiese opstelling (WPS)"</string>
@@ -786,7 +787,7 @@
     <string name="fcc_equipment_id" msgid="149114368246356737">"Toerusting-ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Basisbandweergawe"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernweergawe"</string>
-    <string name="build_number" msgid="3075795840572241758">"Bou-nommer"</string>
+    <string name="build_number" msgid="3075795840572241758">"Bounommer"</string>
     <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nie beskikbaar nie"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
@@ -1160,7 +1161,7 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Voorkeur-installeerligging"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"Verander die voorkeur-installeerligging vir nuwe programme."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Deaktiveer ingeboude program?"</string>
-    <string name="app_disable_dlg_text" msgid="3562567756362627323">"As jy \'n ingeboude program deaktiveer, kan ander hulle programme wangedra."</string>
+    <string name="app_disable_dlg_text" msgid="3562567756362627323">"As jy \'n ingeboude program deaktiveer, kan ander programme hulle dalk wangedra."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vee data uit en deaktiveer program?"</string>
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"As jy \'n ingeboude program deaktiveer, kan ander programme hulle wangedra. Jou data sal ook uitgevee word."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Wil jy kennisgewings afskakel?"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Om te wissel, druk Control-spasiebalk"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Verstek"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Sleutelborduitlegte"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Gebruikerwoordeboek"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Persoonlike woordeboek"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Persoonlike woordeboeke"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Persoonlike woordeboek"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Voeg by"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Voeg by woordeboek"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Toonhoogte"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affekteer die klank van die gesproke teks"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Taal"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Taal nie gekies nie"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Stel die taalspesifieke stem vir gesproke teks"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Luister na \'n voorbeeld"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Speel \'n kort demonstrasie van spraaksintese"</string>
@@ -1512,7 +1512,7 @@
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertroude eiebewyse"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Wys vertroude CA-sertifikate"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Bergingtipe"</string>
-    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardeware-geondersteunde"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardeware-geondersteun"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Net sagteware"</string>
     <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>
@@ -1561,7 +1561,7 @@
     <string name="untitled_apn" msgid="1230060359198685513">"Titelloos"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Algemeen"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Kennisgewings"</string>
-    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Oproep se luitoon en vibreer"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Oproep se luitoon en vibrasie"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Stelsel"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fi-opstelling"</string>
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Koppel aan Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flits aansigte binne die vensters wanneer dit met die GPU geskets is"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Wys hardewarelae se opdaterings"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Laat hardewarelae groen flits wanneer hulle opgedateer word"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Wys GPU-oortrekking"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Van die beste na die slegste: blou, groen, ligrooi, rooi"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Ontfout GPU-oortrek"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Deaktiveer HW-oorleggers"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Gebruik altyd GPU vir skermsamestelling"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktiveer OpenGL-spore"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Gebruikers en profiele"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Voeg gebruiker of profiel by"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Beperkte profiel"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Voordat jy \'n beperkte profiel kan skep, moet jy \'n skermslot opstel om jou programme en persoonlike data te beskerm."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Stel slot op"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nie opgestel nie"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Nie opgestel nie - beperkte profiel"</string>
     <string name="user_owner" msgid="3879126011135546571">"Eienaar"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Bynaam"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Voeg by"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Gebruikers het hul eie programme en inhoud"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Beperkte profiele kan slegs vanaf jou rekeninge toegang tot die programme en inhoud kry"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Jy kan toegang tot programme en inhoud vanaf jou rekening beperk"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Gebruiker"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Beperkte profiel"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Voeg nuwe gebruiker by"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nie nou nie"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Net die eienaar van die tablet kan gebruikers bestuur."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Net die eienaar van die foon kan gebruikers bestuur."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Beperkte profiele kan nie rekeninge byvoeg nie"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Vee <xliff:g id="USER_NAME">%1$s</xliff:g> van hierdie toestel af uit"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nuwe gebruiker"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nuwe profiel"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Verwyder jouself?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Verwyder gebruiker?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Verwyder profiel?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Jy sal jou ruimte en data op hierdie tablet verloor. Jy kan nie hierdie handeling ontdoen nie."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Jy sal jou ruimte en data op hierdie foon verloor. Jy kan nie hierdie handeling ontdoen nie."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Hierdie gebruiker se ruimte en data sal van hierdie tablet af verdwyn. Jy kan nie hierdie handeling ontdoen nie."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Hierdie gebruiker se ruimte en data sal van hierdie foon af verdwyn. Jy kan nie hierdie handeling ontdoen nie."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Hierdie profiel se ruimte en data sal van hierdie tablet af verdwyn. Jy kan nie hierdie handeling ontdoen nie."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Hierdie profiel se ruimte en data sal van hierdie foon af verdwyn. Jy kan nie hierdie handeling ontdoen nie."</string>
     <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>
@@ -1879,13 +1876,12 @@
     <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_restrictions_title" msgid="7745810037152772035">"Program- en inhoudbeperkings"</string>
     <string name="user_rename" msgid="8523499513614655279">"HERNOEM"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Stel programlimiete"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Beheer deur <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
-    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Hierdie program kan toegang tot jou rekenings kry"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Hierdie program word nie in beperkte profiele ondersteun nie"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Hierdie program kan toegang tot jou rekeninge kry"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi en selfoon"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Laat die wysiging van Wi‑Fi en mobiele instellings toe"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -1899,6 +1895,6 @@
     <string name="wizard_next" msgid="3606212602795100640">"Volgende"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"Klaar"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"Neem foto"</string>
-    <string name="user_image_choose_photo" msgid="7940990613897477057">"Kies foto uit galery"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Kies foto vanuit galery"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 443bad2..aef04d7 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"መገኛ ስፍራ"</item>
     <item msgid="255608127647030286">"የግል"</item>
     <item msgid="4588829735729884491">"መልዕክት መላኪያ"</item>
-    <item msgid="8971765125227378270">"መሣሪያ"</item>
+    <item msgid="886742181977884584">"ማህደረ መረጃ"</item>
+    <item msgid="7924928667052300589">"መሣሪያ"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ግምታዊ አካባቢ"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"ድምጽ አጫውት"</item>
     <item msgid="8374996688066472414">"ቅንጥብ መለያ አንብብ"</item>
     <item msgid="3045529469061083747">"ቅንጥብ መለያ ቀይር"</item>
+    <item msgid="5124443975763747838">"የሚዲያ አዝራሮች"</item>
+    <item msgid="4547883971364273343">"የድምጽ ትኩረት"</item>
+    <item msgid="2603878814882344450">"ዋናው ድምጽ መቆጣጠሪያ"</item>
+    <item msgid="7136963238377062018">"የድምጽ መጠን"</item>
+    <item msgid="4270236897655923007">"የደወል ድምጽ መጠን"</item>
+    <item msgid="6325739889222559394">"የማህደረ መረጃ መጠን"</item>
+    <item msgid="5762123934816216821">"የማንቂያ ድምፅ መጠን"</item>
+    <item msgid="785049718065337473">"የማሳወቂያ ድምጽ መጠን"</item>
+    <item msgid="6700305533746877052">"የብሉቱዝ ድምፅ መጠን"</item>
+    <item msgid="2029227495214047094">"እንደነቃ አቆይ"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"አካባቢ"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"ድምጽ አጫውት"</item>
     <item msgid="136815868796597058">"ቅንጥብ ሰሌዳ አንብብ"</item>
     <item msgid="5238692940326972503">"ቅንጥብ መለያ ቀይር"</item>
+    <item msgid="5753789168376302997">"የሚዲያ አዝራሮች"</item>
+    <item msgid="3265262911688671938">"የድምጽ ትኩረት"</item>
+    <item msgid="2098976479485046797">"ዋናው የድምጽ መቆጣጠሪያ"</item>
+    <item msgid="5660213838861789350">"የድምጽ መጠን"</item>
+    <item msgid="7983336752371254444">"የደወል ድምጽ መጠን"</item>
+    <item msgid="7878027809189330917">"የማህደረ መረጃ ክፍልፍል"</item>
+    <item msgid="7260546305036218513">"የማንቂያ ድምፅ መጠን"</item>
+    <item msgid="9103719301075748925">"የማሳወቂያ ድምጽ መጠን"</item>
+    <item msgid="7025966722295861512">"የብሉቱዝ ድምፅ መጠን"</item>
+    <item msgid="4665183401128289653">"እንደነቃ አቆይ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"አጭር"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"ማያ ገጽ ላይ እንደ መስመሮች"</item>
     <item msgid="120512413928262547">"በ adb shell dumpsys gfxinfo ውስጥ"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"ጠፍቷል"</item>
+    <item msgid="7688197031296835369">"ስዕሉ አልፎ የፈሰሰባቸው አካባቢዎችን አሳይ"</item>
+    <item msgid="8332661909019981149">"የአልፎ ፍሰት ቆጣሪውን አሳይ"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"መደበኛ ወሰኖች"</item>
     <item msgid="4071574792028999443">"ምንም የዳራ ሂደቶች የሉም"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 8c6af9e..2ff21bf 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"በተቆለፈ ማያ ላይ ለማሳየት ፅሁፍ አስገባ"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"የተጠቃሚ መረጃ በመቆለፊያ ማያ ገጹ ላይ አሳይ"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"የተጠቃሚ መረጃ"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"የመገለጫ መረጃ በቁልፍ ማያ ገጽ ላይ አሳይ"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"የመገለጫ መረጃ"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"የአካባቢ መዳረሻ"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"ደህንነት"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"የእኔን ስፍራ፣ማያ ክፈት፣SIM ካርድ ሽንጉር፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
@@ -359,7 +361,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ከመካከለኛ እስከ ከፍተኛ ጥበቃ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">" የይለፍ ቃል፡"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ከፍተኛ ጥበቃ"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"የምስጠራ ፖሊሲ ወይም ማስረጃ ማከማቻ በአስተዳዳሪ ቦዝኗል"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"የምስጠራ መምሪያ ወይም ማስረጃ ማከማቻ በአስተዳዳሪ ቦዝኗል"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ምንም"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"ተንሸራታች"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"በፊት ገጽ መክፈቻ"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"አውታረ መረብ ቀይር"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ያሉ አውታረ መረቦችን ለማየት Wi-Fi ያብሩ።"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"የWi-Fi አውታረ መረቦችን በመፈለግ ላይ…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"የWi‑Fi አውታረ መረቡን የመቀየር ፍቃድ የሉዎትም።"</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"ሌላ አውታረ መረብ…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"ተጨማሪ"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"በራስ ሰር ማወቀር (WPS)"</string>
@@ -582,7 +583,7 @@
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"በWi-Fi የተጠበቀ ውቅር"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS በመጀመር ላይ…"</string>
     <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"በራውተርዎ ላይ ያለውን በWi-Fi የሚጠበቀው የማወቀሪያ አዝራርን ይጫኑ። «WPS» ሊባል ይችላል ወይም ይሄንን ምልክት ሊያካትት ይችላል፦"</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"በገመድ አልባ ራውተርዎ ላይ ፒን <xliff:g id="NUMBER">%1$s</xliff:g> ያስገቡ። ማዋቀሩ እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊወስድ ይችላል።"</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"በWi‑Fi ራውተርዎ ላይ ፒን <xliff:g id="NUMBER">%1$s</xliff:g> ያስገቡ። ማዋቀሩ እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊወስድ ይችላል።"</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS ተሳክቷል። ከአውታረ መረቡ ጋር በመገናኘት ላይ…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"ከWi-Fi አውታረ መረብ <xliff:g id="NETWORK_NAME">%s</xliff:g> ጋር ተገናኝቷል"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS አስቀድሞ በሂድት ላይ ነውና እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"ለመቀየር፣ Control-Spacebar ተጫን"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ነባሪ"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"የቁልፍ ሰሌዳ አቀማመጥ"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"የተጠቃሚ መዝገበ ቃላት"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"የግል መዝገበ ቃላት"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"የግል መዝገበ ቃላቶች"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"የግል መዝገበ-ቃላት"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"አክል"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"ወደ መዝገበ ቃላት አክል"</string>
@@ -1271,9 +1270,9 @@
     <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"መተግበሪያዎች"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"አቋራጮች"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"ፅሁፍ ግቤት"</string>
-    <string name="input_method" msgid="5434026103176856164">"የግቤት ሜተድ"</string>
+    <string name="input_method" msgid="5434026103176856164">"የግቤት ስልት"</string>
     <string name="current_input_method" msgid="234072873286056438">"ነባሪ"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"የግቤት ሜተድ መራጭ"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"የግቤት ስልት መራጭ"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"ራስ ሰር"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"ሁልጊዜ አሳይ"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"ሁልጊዜ ደብቅ"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ቅላፄ"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"የሚነገረው ፅሁፍ ድምፅ ላይ ተፅዕኖ ያሳድራል"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"ቋንቋ"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ቋንቋ አልተመረጠም"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"ለሚነገረው ፅሁፍ ቋንቋ-ተኮር ድምፅ አዘጋጅ"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"ምሳሌውን አዳምጥ"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"አጭር የንግግር ልምምድ ማሳያ አጫውት"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"ከGPU ጋር ሲሳል መስኮቶች ውስጥ እይታዎችን አብለጭልጭ"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"የሃርድዌር ንብርብሮች ዝማኔዎችን አሳይ"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"የሃርድዌር ንብርብሮች ሲዘምኑ አረንጓዴ አብራ"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"የጂፒዩ አብዝቶ መሳልን አሳይ"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"ከምርጡ ወደ መጥፎው፦ ሰማያዊ፣ አረንጓዴ፣ ቀላ ያለ ቀይ፣ ቀይ"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"የጂፒዩ አልፎ መሳል አርም"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"የHW ተደራቢዎችን አሰናክል"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ለማያ ገጽ ማቀናበሪያ ሁልጊዜ GPU ተጠቀም"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"የ OpenGL ክትትሎችን ያንቁ"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"ተጠቃሚዎች እና መገለጫዎች"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"ተጠቃሚ ወይም መገለጫ አክል"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"የተገደበ መገለጫ"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"የተገደበ መገለጫ መፍጠር ከመቻልዎ በፊት መተግበሪያዎችዎን እና የግል ውሂብዎን ለመጠበቅ ቁልፍ ማያ ገጽ ማዋቀር አለብዎት።"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"ቁልፍ አዘጋጅ"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"አልተዋቀረም"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"አልተዋቀረም - የተገደበ መገለጫ"</string>
     <string name="user_owner" msgid="3879126011135546571">"ባለቤት"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"ቅጽል ስም"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"አክል"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"ተጠቃሚዎች የራሳቸው መተግበሪያዎች እና ይዘት አሏቸው"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"የተገደቡ መገለጫዎች ከመለያዎችዎ የመጡ መተግበሪያዎችን እና ይዘትን ብቻ ነው ሊደርሱበት የሚችሉት።"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"ከመለያዎ ላይ የመተግበሪያዎች መዳረሻን እና ይዘትን መገደብ ይችላሉ"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ተጠቃሚ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"የተገደበ መገለጫ"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"አዲሰ ተጠቃሚ አክል"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"አሁን አይደለም"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"የጡባዊው ባለቤት ብቻ ነው ተጠቃሚዎችን ማስተዳደር የሚችለው።"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"የስልኩ ባለቤት ብቻ ነው ተጠቃሚዎችን ማስተዳደር የሚችለው።"</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"የተገደቡ መገለጫዎች መለያዎችን ማከል አይችሉም"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g>ን ከዚህ መሣሪያ ሰርዝ"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"አዲስ ተጠቃሚ"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"አዲስ መገለጫ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"እራስዎን ይሰርዙ?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"ተጠቃሚ ይወገድ?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"መገለጫ ይወገድ?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"በዚህ ጡባዊ ላይ ቦታዎን እና ውሂብዎን ያጣሉ። ይህን እርምጃ መቀልበስ አይችሉም።"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"በዚህ ስልክ ላይ ቦታዎን እና ውሂብዎን ያጣሉ። ይህን እርምጃ መቀልበስ አይችሉም።"</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"የዚህ ተጠቃሚ ቦታ እና ውሂብ ከዚህ ጡባዊ ይጠፋል። ይህን እርምጃ መቀልበስ አይችሉም።"</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"የዚህ ተጠቃሚ ቦታ እና ውሂብ ከዚህ ስልክ ይጠፋል። ይህን እርምጃ መቀልበስ አይችሉም።"</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"የዚህ መገለጫ ቦታ እና ውሂብ ከዚህ ጡባዊ ይጠፋል። ይህን እርምጃ መቀልበስ አይችሉም።"</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"የዚህ መገለጫ ቦታ እና ውሂብ ከዚህ ስልክ ይጠፋል። ይህን እርምጃ መቀልበስ አይችሉም።"</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"የመተግበሪያ እና የይዘት ገደቦች"</string>
     <string name="user_rename" msgid="8523499513614655279">"ዳግም ሰይም"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"የመተግበሪያ ገደቦችን ያዋቅሩ"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"በ<xliff:g id="APP">%1$s</xliff:g> የሚቆጣጠሩ"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"ይህ መተግበሪያ በተገደቡ መገለጫዎች ውስጥ አይደገፍም"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"ይህ መተግበሪያ መለያዎችዎን ሊደርስባቸው ይችላል"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi እና ተንቀሳቃሽ ስልክ"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"የWi‑Fi እና የተንቀሳቃሽ ስልክ ቅንብሮች መቀየርን ይፍቀዱ"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index aaa29c7..a38b1ff 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"الموقع"</item>
     <item msgid="255608127647030286">"شخصية"</item>
     <item msgid="4588829735729884491">"المراسلة"</item>
-    <item msgid="8971765125227378270">"الجهاز"</item>
+    <item msgid="886742181977884584">"الوسائط"</item>
+    <item msgid="7924928667052300589">"الجهاز"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"الموقع التقريبي"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"تشغيل الصوت"</item>
     <item msgid="8374996688066472414">"قراءة الحافظة"</item>
     <item msgid="3045529469061083747">"تعديل الحافظة"</item>
+    <item msgid="5124443975763747838">"أزرار الوسائط"</item>
+    <item msgid="4547883971364273343">"التركيز على الصوت"</item>
+    <item msgid="2603878814882344450">"مستوى الصوت الرئيسي"</item>
+    <item msgid="7136963238377062018">"مستوى الصوت"</item>
+    <item msgid="4270236897655923007">"مستوى صوت الرنين"</item>
+    <item msgid="6325739889222559394">"مستوى صوت الوسائط"</item>
+    <item msgid="5762123934816216821">"مستوى صوت المنبه"</item>
+    <item msgid="785049718065337473">"مستوى صوت الإشعار"</item>
+    <item msgid="6700305533746877052">"مستوى صوت البلوتوث"</item>
+    <item msgid="2029227495214047094">"البقاء في الوضع النشط"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"الموقع"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"تشغيل الصوت"</item>
     <item msgid="136815868796597058">"قراءة الحافظة"</item>
     <item msgid="5238692940326972503">"تعديل الحافظة"</item>
+    <item msgid="5753789168376302997">"أزرار الوسائط"</item>
+    <item msgid="3265262911688671938">"التركيز على الصوت"</item>
+    <item msgid="2098976479485046797">"مستوى الصوت الرئيسي"</item>
+    <item msgid="5660213838861789350">"مستوى الصوت"</item>
+    <item msgid="7983336752371254444">"مستوى صوت الرنين"</item>
+    <item msgid="7878027809189330917">"مستوى صوت الوسائط"</item>
+    <item msgid="7260546305036218513">"مستوى صوت المنبّه"</item>
+    <item msgid="9103719301075748925">"مستوى صوت الإشعار"</item>
+    <item msgid="7025966722295861512">"مستوى صوت البلوتوث"</item>
+    <item msgid="4665183401128289653">"البقاء في الوضع النشط"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"قصيرة"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"على الشاشة كخطوط"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"إيقاف"</item>
+    <item msgid="7688197031296835369">"عرض مناطق تجاوز الحد"</item>
+    <item msgid="8332661909019981149">"عرض مقابل تجاوز الحد"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"الحد القياسي"</item>
     <item msgid="4071574792028999443">"ليست هناك عمليات بالخلفية"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a875abf..0f28651 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"اكتب النص الذي سيعرض على شاشة التأمين"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"إظهار معلومات المستخدم في شاشة التأمين"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"معلومات المستخدم"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"إظهار معلومات الملف الشخصي في شاشة التأمين"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"معلومات الملف الشخصي"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"الدخول إلى الموقع"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"الأمان"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين بطاقة SIM، تأمين تخزين الاعتماد"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"تعديل الشبكة"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"لمشاهدة الشبكات المتاحة، شغّل Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"جارٍ البحث عن شبكات Wi-Fi..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"ليس لديك إذن لتغيير شبكة Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"شبكة أخرى..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"المزيد"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"الإعداد التلقائي (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"للتبديل، اضغط على ctrl-مسافة"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"افتراضي"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"تخطيطات لوحة المفاتيح"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"قاموس المستخدم"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"قاموس شخصي"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"القواميس الشخصية"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"القاموس الشخصي"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"إضافة"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"إضافة إلى القاموس"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"درجة الصوت"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"يؤثر في نبرة النص المنطوق"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"اللغة"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"اللغة غير محددة"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"تعيين الصوت الخاص بلغة النص المنطوق"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"الاستماع إلى مثال"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"تشغيل عرض توضيحي قصير لتجميع الكلام"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"وميض العروض داخل النوافذ عندما يتم الرسم باستخدام وحدة معالجة الرسومات"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"عرض تحديثات طبقات الأجهزة"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"تشغيل وميض بالأخضر لطبقات الأجهزة عند تحديثها"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"عرض استخدام GPU الزائد"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"من الأفضل إلى الأسوأ: أزرق، أخضر، أحمر فاتح، أحمر"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"تصحيح تجاوز حد وحدة معالجة الرسومات"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"تعطيل تراكبات الأجهزة"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"استخدام وحدة معالجة الرسومات دائمًا لتركيب الشاشة"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"تمكين عمليات تتبع OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"المستخدمون والملفات الشخصية"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"إضافة مستخدم أو ملف شخصي"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"ملف شخصي محظور"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"قبل أن تتمكن من إنشاء ملف شخصي مقيد، يلزمك إعداد تأمين للشاشة لحماية تطبيقاتك وبياناتك الشخصية."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"تعيين التأمين"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"لم يتم الإعداد."</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"لا يُمكن الإعداد - الملف الشخصي محظور"</string>
     <string name="user_owner" msgid="3879126011135546571">"المالك"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"اللقب"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"إضافة"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"المستخدمون لديهم تطبيقات ومحتوى خاص بهم"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"لا يُمكن للملفات الشخصية المحظورة سوى الدخول إلى التطبيقات والمحتوى من حساباتك"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"يمكنك تقييد الدخول إلى التطبيقات والمحتوى من حسابك"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"المستخدم"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"ملف شخصي محظور"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"إضافة مستخدم جديد"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"ليس الآن"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"يمكن لمالك الجهاز اللوحي فقط إدارة المستخدمين."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"يمكن لمالك الهاتف فقط إدارة المستخدمين."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"لا يمكن للملفات الشخصية إضافة حسابات"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"حذف <xliff:g id="USER_NAME">%1$s</xliff:g> من هذا الجهاز"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"مستخدم جديد"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"ملف شخصي جديد"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"هل تريد حذف نفسك؟"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"إزالة المستخدم؟"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"هل تريد إزالة الملف الشخصي؟"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"ستفقد مساحتك وبياناتك من هذا الجهاز اللوحي. لا يمكنك التراجع عن هذا الإجراء."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"ستفقد مساحتك وبياناتك من هذا الهاتف. لا يمكنك التراجع عن هذا الإجراء."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"ستختفي مساحة هذا المستخدم وبياناته من هذا الجهاز اللوحي. لا يمكنك التراجع عن هذا الإجراء."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"ستختفي مساحة هذا المستخدم وبياناته من هذا الهاتف. لا يمكنك التراجع عن هذا الإجراء."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"ستختفي مساحة هذا الملف الشخصي وبياناته من هذا الجهاز اللوحي. لا يمكنك التراجع عن هذا الإجراء."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"ستختفي مساحة هذا الملف الشخصي وبياناته من هذا الهاتف. لا يمكنك التراجع عن هذا الإجراء."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"قيود التطبيقات والمحتوى"</string>
     <string name="user_rename" msgid="8523499513614655279">"إعادة تسمية"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"تعيين حدود التطبيقات"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"يتم التحكم فيه بواسطة <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"هذا التطبيق غير متوافق مع الملفات الشخصية المقيدة"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"يمكن لهذا التطبيق الدخول إلى حساباتك"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi والجوال"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"السماح بتعديل إعدادات Wi‑Fi والجوال"</string>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index b4fbef2..0d36aaf 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Месцазнаходжанне"</item>
     <item msgid="255608127647030286">"Персанальны"</item>
     <item msgid="4588829735729884491">"Абмен паведамленнямі"</item>
-    <item msgid="8971765125227378270">"Прылада"</item>
+    <item msgid="886742181977884584">"Медыя"</item>
+    <item msgid="7924928667052300589">"Прылада"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"прыблiзнае месцазнаходжанне"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"прайграць аўдыё"</item>
     <item msgid="8374996688066472414">"счытаць буфер абмену"</item>
     <item msgid="3045529469061083747">"змяніць буфер абмену"</item>
+    <item msgid="5124443975763747838">"мультымедыйныя кнопкі"</item>
+    <item msgid="4547883971364273343">"аўдыёфокус"</item>
+    <item msgid="2603878814882344450">"асноўны рэгулятар гучнасці"</item>
+    <item msgid="7136963238377062018">"гучнасць голаса"</item>
+    <item msgid="4270236897655923007">"гучнасць выкліка"</item>
+    <item msgid="6325739889222559394">"гучнасць прайгравальніка"</item>
+    <item msgid="5762123934816216821">"гучнасць будзільніка"</item>
+    <item msgid="785049718065337473">"гучнасць апавяшчэнняў"</item>
+    <item msgid="6700305533746877052">"гучнасць Bluetooth"</item>
+    <item msgid="2029227495214047094">"не ўваходзіць у рэжым сна"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Месцазнаходжанне"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Прайграванне аўдыё"</item>
     <item msgid="136815868796597058">"Счытаць буфер абмену"</item>
     <item msgid="5238692940326972503">"Змяніць буфер абмену"</item>
+    <item msgid="5753789168376302997">"Мультымедыйныя кнопкі"</item>
+    <item msgid="3265262911688671938">"Аўдыёфокус"</item>
+    <item msgid="2098976479485046797">"Асноўны рэгулятар гучнасці"</item>
+    <item msgid="5660213838861789350">"Гучнасць голаса"</item>
+    <item msgid="7983336752371254444">"Гучнасць выкліка"</item>
+    <item msgid="7878027809189330917">"Гучнасць прайгравальніка"</item>
+    <item msgid="7260546305036218513">"Гучнасць будзільніка"</item>
+    <item msgid="9103719301075748925">"Гучнасць апавяшчэнняў"</item>
+    <item msgid="7025966722295861512">"Гучнасць Bluetooth"</item>
+    <item msgid="4665183401128289653">"Не ўваходзіць у рэжым сна"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кароткі"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"На экране ў выглядзе ліній"</item>
     <item msgid="120512413928262547">"У абалонцы adb dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Адключаны"</item>
+    <item msgid="7688197031296835369">"Паказаць вобласці з перабольшваннем"</item>
+    <item msgid="8332661909019981149">"Паказаць лічыльнік перабольшвання"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартны ліміт"</item>
     <item msgid="4071574792028999443">"Няма фонавых працэсаў"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 9af0550..ab5e134 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Увядзіце тэкст, які адлюстроўваецца на экране блакавання"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Паказаць інфармацыю пра карыстальніка на экране блакiроўкi"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Інфармацыя карыстальніка"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Паказаць звесткi профiлю на экране блакiроўцы"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Звесткi профiлю"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Доступ да месцазнаходжання"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Бяспека"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Задаць Маё месцазнаходжанне, разблакаванне экрана, блакаванне SIM-карты, блакаванне сховішча ўліковых дадзеных"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Змяніць сетку"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Каб праглядзець даступныя сеткi, уключыце Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Пошук сеткI Wi-Fi..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"У вас няма дазволу на змяненне сеткі Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Іншая сетка..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Дадатковая інфармацыя"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Аўтаматычная ўсталёўка (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Каб перакл., націсніце Ctrl-Space"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Па змаўчанні"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Раскладкі клавіятуры"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Карыстальніцкі слоўнік"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Асабісты слоўнік"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Асабістыя слоўнікі"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Персанальны слоўнік"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Дадаць"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Дадаць у слоўнік"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Тон"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Уплывае на тон вуснага тэксту"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Мова"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Мова не выбрана"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Задае голас прамаўлення тэкту на канкрэтнай мове"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Паслухайце прыклад"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Прайграць кароткую дэманстрацыю сінтэзу гаворкі"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Мігнуць вакном пры чарчэнні з дапамогай GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Паказаць абнаўленнi апаратнага пласта"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Апаратныя пласты набываюць зялёны колер, калi абнаўляюцца"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Паказаць перарасход GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Ад лепшага да горшага: сіні, зялёны, светла-чырвоны, чырвоны"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Адладка перамалёўкі GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Адкл. апаратн. накладання"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Заўсёды выкарыстоўваць GPU для экраннай кампаноўкі"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Уключэнне слядоў OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Карыстальнікi і профілi"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Дадаць карыстальніка або профіль"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Абмежаваны профiль"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Перш чым вы зможаце стварыць профіль, у якiм будуць абмежаваннi, вам трэба наладзіць блакiроўку экрана для абароны сваiх прыкладанняў і персанальных дадзеных."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Усталёўка блакiроўкi"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не наладжана"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Не наладжаны: абмежаваны профіль"</string>
     <string name="user_owner" msgid="3879126011135546571">"Уладальнік"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Псеўданім"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Дадаць"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Карыстальнікі маюць свае ўласныя прыкладанні і змесцiва"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Абмежаваныя профілі могуць толькі атрымаць доступ да прыкладанняў і змесцiва з улiковых запiсаў"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Вы можаце абмяжоўваць доступ да прыкладанняў і змесціва са свайго ўліковага запісу"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Карыстальнік"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Абмежаваны профiль"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Дад. новага карыстальніка"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не цяпер"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Толькі ўладальнік планшэта можа кіраваць звесткамi пра карыстальнікаў."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Толькі ўладальнік тэлефона можа кіраваць звесткамi пра карыстальнікаў."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Уладальнiкi профіляў з абмежаваннямi не могуць дадаваць уліковыя запісы"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Выдаліць <xliff:g id="USER_NAME">%1$s</xliff:g> з гэтай прылады"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Новы карыстальнік"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Новы профiль"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Выдаляеце сябе?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Выдаліць карыстальніка?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Выдаліць профiль?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Гэта прастора і дадзеныя будуць выдалены з гэтага планшэта. Немагчыма адмяніць гэта дзеянне."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Гэта прастора і дадзеныя будуць выдалены з гэтага тэлефона. Немагчыма адмяніць гэта дзеянне."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Гэта прастора карыстальніка і дадзеныя будуць выдалены з гэтага планшэта. Немагчыма адмяніць гэта дзеянне."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Гэта прастора карыстальніка і дадзеныя будуць выдалены з гэтага тэлефона. Немагчыма адмяніць гэта дзеянне."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Гэта прастора профiлю і дадзеныя будуць выдалены з гэтага планшэта. Немагчыма адмяніць гэта дзеянне."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Гэта прастора профiлю і дадзеныя будуць выдалены з гэтага тэлефона. Немагчыма адмяніць гэта дзеянне."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Абмежаванні па прыкладаннi і змесціву"</string>
     <string name="user_rename" msgid="8523499513614655279">"ПЕРАЙМЕНАВАЦЬ"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Усталяваць межы прыкладання"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Кіруецца <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Гэта прыкладанне не падтрымліваецца ў профілях з абмежаваннямi"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Гэтае прыкладанне можа атрымліваць доступ да вашых уліковых запісаў"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Сеткі Wi-Fi і мабільныя сеткі"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Дазволіць змяненне параметраў сетак Wi-Fi і мабільных сетак"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 10d6f2a..b083f35 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Местоположение"</item>
     <item msgid="255608127647030286">"Лични"</item>
     <item msgid="4588829735729884491">"Съобщения"</item>
-    <item msgid="8971765125227378270">"Устройство"</item>
+    <item msgid="886742181977884584">"Мултимедия"</item>
+    <item msgid="7924928667052300589">"Устройство"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"местоположение с ниска точност"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"възпроизвеждане на звук"</item>
     <item msgid="8374996688066472414">"четене на буферната памет"</item>
     <item msgid="3045529469061083747">"промяна на буферната памет"</item>
+    <item msgid="5124443975763747838">"бутони за мултимедия"</item>
+    <item msgid="4547883971364273343">"фокусиране на звука"</item>
+    <item msgid="2603878814882344450">"основна сила на звука"</item>
+    <item msgid="7136963238377062018">"сила на звука за глас"</item>
+    <item msgid="4270236897655923007">"сила на звука при звънене"</item>
+    <item msgid="6325739889222559394">"сила на звука за мултимедия"</item>
+    <item msgid="5762123934816216821">"сила на звука на будилника"</item>
+    <item msgid="785049718065337473">"сила на звука за известия"</item>
+    <item msgid="6700305533746877052">"сила на звука за Bluetooth"</item>
+    <item msgid="2029227495214047094">"оставяне в будно състояние"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Местоположение"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Възпроизвеждане на звук"</item>
     <item msgid="136815868796597058">"Четене на буферната памет"</item>
     <item msgid="5238692940326972503">"Промяна на буферната памет"</item>
+    <item msgid="5753789168376302997">"Бутони за мултимедия"</item>
+    <item msgid="3265262911688671938">"Фокусиране на звука"</item>
+    <item msgid="2098976479485046797">"Основна сила на звука"</item>
+    <item msgid="5660213838861789350">"Сила на звука за глас"</item>
+    <item msgid="7983336752371254444">"Сила на звука при звънене"</item>
+    <item msgid="7878027809189330917">"Сила на звука за мултимедия"</item>
+    <item msgid="7260546305036218513">"Сила на звука на будилника"</item>
+    <item msgid="9103719301075748925">"Сила на звука при известие"</item>
+    <item msgid="7025966722295861512">"Сила на звука за Bluetooth"</item>
+    <item msgid="4665183401128289653">"Оставяне в будно състояние"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"На екрана като линии"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Изключено"</item>
+    <item msgid="7688197031296835369">"Области за преизчертаване: Показв."</item>
+    <item msgid="8332661909019981149">"Брояч на преизчертаване: Показване"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартно ограничение"</item>
     <item msgid="4071574792028999443">"Няма процеси на заден план"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b8d895d..5f34277 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Въведете текст за показване на заключения екран"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Информация за потребителя върху заключен екран"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Данни за потребителя"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Показв. на инф. за потр. профил върху закл. екран"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Инф. за потр. профил"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Достъп до местоположение"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Сигурност"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Промяна на мрежа"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Включете Wi‑Fi, за да видите наличните мрежи."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Търсят се Wi‑Fi мрежи…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Нямате разрешение да променяте Wi‑Fi мрежата."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Друга мрежа…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Още"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Авт. настройка (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"За превключване натиснете „Ctrl“-интервал"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"По подразбиране"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Клавиатурни подредби"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Потребителски речник"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Личен речник"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Лични речници"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Личен речник"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Добавяне"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Добавяне в речника"</string>
@@ -1296,7 +1295,7 @@
     <string name="bugreport_in_power" msgid="4548816486587403971">"Сигнали за програмни грешки в менюто за захранване"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Включване на опцията за получаване на сигнал за програмна грешка в менюто за захранване"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Да остане активен"</string>
-    <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екранът никога няма е в спящ режим при зареждане"</string>
+    <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екранът никога няма да е в спящ режим при зареждане"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Разрешаване на измислени местоположения"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешаване на измислени местоположения"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Разрешаване на отстраняването на грешки през USB?"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Височина"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Отразява се на тона на изговорения текст"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Език"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Езикът не е избран"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Задава глас за конкретен език за изговорения текст"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Чуйте пример"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Възпроизвеждане на кратка демонстрация на синтезиране на реч"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Примигв. на изгледи в прозорците при начертаване с GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Актуализации на слоевете на хардуера"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Примигв. на слоевете на хардуера в зелено при актуал."</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Преизчертаване от GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"От най-добро към най-лошо: синьо, зелено, светло червено, червено"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Отстран. на проблеми, свързани с преизчертаване от ГП"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Хардуерни наслагвания: Деактив."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Винаги да се използва GPU за изграждане на екрана"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Трасирания на OpenGL: Акт."</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Потребители и потребителски профили"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Добавяне на потр. или потр. профил"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ограничен потребителски профил"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Преди да можете да създадете потребителски профил с ограничена функционалност, трябва да настроите заключения екран, за да защитите приложенията и личните си данни."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Задаване на заключване"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не е настроен"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Не е настроен – ограничен потребителски профил"</string>
     <string name="user_owner" msgid="3879126011135546571">"Собственик"</string>
@@ -1833,7 +1834,8 @@
     <string name="user_nickname" msgid="5148818000228994488">"Псевдоним"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Добавяне"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Потребителите имат свои собствени приложения и съдържание"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Ограничените потребителски профили имат достъп само до приложенията и съдържанието от профилите ви"</string>
+    <!-- no translation found for user_add_profile_item_summary (5931663986889138941) -->
+    <skip />
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Потребител"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ограничен потр. профил"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Добавяне на нов потребител"</string>
@@ -1846,23 +1848,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не сега"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Само собственикът на таблета може да управлява потребителите."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Само собственикът на телефона може да управлява потребителите."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"В потребителските профили с ограничена функционалност не могат да се добавят профили"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Изтриване на <xliff:g id="USER_NAME">%1$s</xliff:g> от у-вото"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Нов потребител"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Нов потребителски профил"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Искате ли да се изтриете?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Да се премахне ли?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Да се премахне ли потр. профил?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Ще загубите работното си пространство и данните си на този таблет. Не можете да отмените това действие."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Ще загубите работното си пространство и данните си на този телефон. Не можете да отмените това действие."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Работното пространство и данните на този потребител ще изчезнат от таблета. Не можете да отмените това действие."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Работното пространство и данните на този потребител ще изчезнат от телефона. Не можете да отмените това действие."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Работното пространство и данните на този потребителски профил ще изчезнат от таблета. Не можете да отмените това действие."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Работното пространство и данните на този потребителски профил ще изчезнат от телефона. Не можете да отмените това действие."</string>
     <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>
@@ -1879,12 +1877,12 @@
     <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>
+    <!-- no translation found for user_restrictions_title (7745810037152772035) -->
+    <skip />
     <string name="user_rename" msgid="8523499513614655279">"ПРЕИМЕНУВАНЕ"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Огранич. за приложението: Задаване"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Контролирани от <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Това приложение не се поддържа от потребителски профили с ограничена функционалност"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Това приложение има достъп до профилите ви"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi и мобилни данни"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Разрешаване на промяна на настройките за Wi‑Fi и мобилни данни"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 2d1c697..fa93293 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Ubicació"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Missatgeria"</item>
-    <item msgid="8971765125227378270">"Dispositiu"</item>
+    <item msgid="886742181977884584">"Multimèdia"</item>
+    <item msgid="7924928667052300589">"Dispositiu"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ubicació aproximada"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"reprodueix l\'àudio"</item>
     <item msgid="8374996688066472414">"llegeix el porta-retalls"</item>
     <item msgid="3045529469061083747">"modifica el porta-retalls"</item>
+    <item msgid="5124443975763747838">"botons multimèdia"</item>
+    <item msgid="4547883971364273343">"enfocament de l\'àudio"</item>
+    <item msgid="2603878814882344450">"volum general"</item>
+    <item msgid="7136963238377062018">"volum de la veu"</item>
+    <item msgid="4270236897655923007">"volum del to"</item>
+    <item msgid="6325739889222559394">"volum multimèdia"</item>
+    <item msgid="5762123934816216821">"volum de l\'alarma"</item>
+    <item msgid="785049718065337473">"volum de notificació"</item>
+    <item msgid="6700305533746877052">"volum del Bluetooth"</item>
+    <item msgid="2029227495214047094">"actiu"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ubicació"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Reprodueix l\'àudio"</item>
     <item msgid="136815868796597058">"Llegeix el porta-retalls"</item>
     <item msgid="5238692940326972503">"Modifica el porta-retalls"</item>
+    <item msgid="5753789168376302997">"Botons de multimèdia"</item>
+    <item msgid="3265262911688671938">"Enfocament de l\'àudio"</item>
+    <item msgid="2098976479485046797">"Volum general"</item>
+    <item msgid="5660213838861789350">"Volum de la veu"</item>
+    <item msgid="7983336752371254444">"Volum del to"</item>
+    <item msgid="7878027809189330917">"Volum de multimèdia"</item>
+    <item msgid="7260546305036218513">"Volum de l\'alarma"</item>
+    <item msgid="9103719301075748925">"Volum de notificació"</item>
+    <item msgid="7025966722295861512">"Volum de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Actiu"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curt"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"A la pantalla com a línies"</item>
     <item msgid="120512413928262547">"A adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Desactiva"</item>
+    <item msgid="7688197031296835369">"Mostra les àrees modificades"</item>
+    <item msgid="8332661909019981149">"Mostra comptador modificacions"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límit estàndard"</item>
     <item msgid="4071574792028999443">"Sense processos en segon pla"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 8798946..3e2d1d4 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Escriu el text que vulguis mostrar a la pantalla de bloqueig"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostra info. de l\'usuari a la pantalla de bloqueig"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Info. de l\'usuari"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostra la inf. de perfil a la pantalla de bloqueig"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informació de perfil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Accés a la ubicació"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Seguretat"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Defineix La meva ubicació, el desbloqueig de la pantalla, el bloqueig de la targeta SIM i el bloqueig de l\'emmagatzematge de credencials"</string>
@@ -424,7 +426,7 @@
     <item quantity="one" msgid="8344183614159211585">"%d aplicació pot llegir notificacions."</item>
     <item quantity="other" msgid="980049191810249052">"%d aplicacions poden llegir notificacions."</item>
   </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"No hi ha cap processador de notificacions instal·lat."</string>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"No hi ha cap detector de notificacions instal·lat."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vols activar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrà llegir totes les notificacions que publiqui el sistema o qualsevol aplicació instal·lada, que poden contenir informació personal com ara noms de contactes i el text dels missatges que rebeu. També podrà ometre-les o tocar els botons d\'acció que continguin."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica la xarxa"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Per veure les xarxes disponibles, activa la Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"S\'estan cercant xarxes Wi-Fi..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"No tens permís per canviar la xarxa Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Una altra xarxa…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Més"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automàtica (WPS)"</string>
@@ -1205,8 +1206,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Vols aturar el servei del sistema?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Si atures aquest servei, hi ha funcions de la tauleta que és possible que deixin de funcionar correctament fins que no l\'apaguis i la tornis a engegar."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si atures aquest servei, és possible que hi hagi funcions del telèfon que deixin de funcionar correctament fins que no l\'apaguis i el tornis a engegar."</string>
-    <string name="language_settings" msgid="5292716747264442359">"Idioma i entrada de text"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma i entrada de text"</string>
+    <string name="language_settings" msgid="5292716747264442359">"Idioma i introducció de text"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma i introducció de text"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Configuració d\'idioma"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclat i mètodes d\'entrada"</string>
     <string name="phone_language" msgid="8870144109924299673">"Idioma"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Per canviar, prem Ctrl + barra espaiadora"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predeterminat"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Disposicions de teclat"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionari de l\'usuari"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionari personal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Diccionaris personals"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Diccionari personal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Afegeix"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Afegir al diccionari"</string>
@@ -1270,8 +1269,8 @@
     <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Cancel·la"</string>
     <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Aplicacions"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Dreceres"</string>
-    <string name="input_methods_settings_title" msgid="6800066636850553887">"Entrada de text"</string>
-    <string name="input_method" msgid="5434026103176856164">"Mètode d\'entrada"</string>
+    <string name="input_methods_settings_title" msgid="6800066636850553887">"Introducció de text"</string>
+    <string name="input_method" msgid="5434026103176856164">"Mètode d\'introducció de text"</string>
     <string name="current_input_method" msgid="234072873286056438">"Predeterminat"</string>
     <string name="input_method_selector" msgid="4311213129681430709">"Selector del mètode d\'entrada"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automàtic"</string>
@@ -1292,7 +1291,7 @@
     <string name="development_settings_not_available" msgid="4308569041701535607">"Les opcions per a desenvolupadors no estan disponibles per a aquest usuari."</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuració USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Activa el mode de depuració quan el dispositiu estigui connectat per USB"</string>
-    <string name="clear_adb_keys" msgid="4038889221503122743">"Revoca les autoritzacions de depuració d\'USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Revoca autoritzacions depuració USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Informe d\'error al menú"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inclou l\'opció de fer un informe d\'error al menú d\'encesa"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Pantalla activa"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"To"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta el to del text parlat"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"No has seleccionat cap idioma"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Defineix la llengua utilitzada per a la síntesi de veu"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Vull escoltar un exemple"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reprodueix una breu demostració de síntesi de veu"</string>
@@ -1606,7 +1606,7 @@
     <string name="sync_automatically" msgid="1682730255435062059">"Sincr. autom. dades de l\'aplicació"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sincronització activa"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sense sincronització"</string>
-    <string name="sync_error" msgid="5060969083117872149">"Error sincron."</string>
+    <string name="sync_error" msgid="5060969083117872149">"Error de sincronització"</string>
     <string name="last_synced" msgid="4242919465367022234">"Darrera sincronització: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"S\'està sincronitzant ara..."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Còpia de seguretat de la configuració"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Actualitza vistes de finestres creades amb GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Mostra actualitzacions capes"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Il·lumina capes de maquinari en verd en actualitzar-se"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Mostra superació de GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"De millor a pitjor: blau, verd, vermell clar, vermell"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Depura modificacions GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desactiva superposicions HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per combinar pantalles"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activa seguiment d\'OpenGL"</string>
@@ -1685,7 +1684,7 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Força l\'ús de GPU per a dibuixos en 2D"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Força MSAA  4x"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Activa MSAA 4x en aplicacions d\'OpenGL ES 2.0"</string>
-    <string name="show_non_rect_clip" msgid="505954950474595172">"Depura operacions de retall no rectangulars"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Depura operacions retall no rectangulars"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Perfil de renderització de GPU"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala d\'animació finestra"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala d\'animació transició"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Usuaris i perfils"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Afegeix un usuari o un perfil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restringit"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Per crear un perfil restringit, has de configurar una pantalla de bloqueig per protegir les aplicacions i les dades personals."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Defineix el bloqueig"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"No s\'ha configurat"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"No configurat: perfil restringit"</string>
     <string name="user_owner" msgid="3879126011135546571">"Propietari"</string>
@@ -1833,7 +1834,8 @@
     <string name="user_nickname" msgid="5148818000228994488">"Àlies"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Afegeix"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Els usuaris tenen les seves aplicacions i el seu contingut"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Els perfils restringits només poden accedir a les aplicacions i al contingut dels teus comptes"</string>
+    <!-- no translation found for user_add_profile_item_summary (5931663986889138941) -->
+    <skip />
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuari"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restringit"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Afegir un usuari nou"</string>
@@ -1846,23 +1848,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ara no"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Només el propietari de la tauleta pot gestionar els usuaris."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Només el propietari del telèfon pot gestionar els usuaris."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Els perfils restringits no poden afegir comptes."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Suprimeix <xliff:g id="USER_NAME">%1$s</xliff:g> del dispositiu"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Usuari nou"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Perfil nou"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Et vols suprimir a tu mateix?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Vols eliminar l\'usuari?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Vols suprimir el perfil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Perdràs l\'espai i les dades de la tauleta. No pots desfer aquesta acció."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Perdràs l\'espai i les dades del telèfon. No pots desfer aquesta acció."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"L\'espai i les dades d\'aquest usuari desapareixeran de la tauleta. No pots desfer aquesta acció."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"L\'espai i les dades d\'aquest usuari desapareixeran del telèfon. No pots desfer aquesta acció."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"L\'espai i les dades del perfil desapareixeran de la tauleta. No pots desfer aquesta acció."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"L\'espai i les dades del perfil desapareixeran del telèfon. No pots desfer aquesta acció."</string>
     <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>
@@ -1879,12 +1877,12 @@
     <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>
+    <!-- no translation found for user_restrictions_title (7745810037152772035) -->
+    <skip />
     <string name="user_rename" msgid="8523499513614655279">"CANVIA EL NOM"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Defineix límits a l\'aplicació"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlades per <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Aquesta aplicació no és compatible amb perfils restringits."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Aquesta aplicació pot accedir als teus comptes"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi i mòbil"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Permet la modificació de la configuració Wi‑Fi i mòbil"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 0fa7e05..c1b91d1 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Poloha"</item>
     <item msgid="255608127647030286">"Osobní"</item>
     <item msgid="4588829735729884491">"SMS a MMS"</item>
-    <item msgid="8971765125227378270">"Zařízení"</item>
+    <item msgid="886742181977884584">"Média"</item>
+    <item msgid="7924928667052300589">"Zařízení"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"přibližná poloha"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"přehrávání zvuku"</item>
     <item msgid="8374996688066472414">"číst obsah schránky"</item>
     <item msgid="3045529469061083747">"upravit obsah schránky"</item>
+    <item msgid="5124443975763747838">"tlačítka médií"</item>
+    <item msgid="4547883971364273343">"zaměření zvuku"</item>
+    <item msgid="2603878814882344450">"hlavní hlasitost"</item>
+    <item msgid="7136963238377062018">"hlasitost hlasu"</item>
+    <item msgid="4270236897655923007">"hlasitost vyzvánění"</item>
+    <item msgid="6325739889222559394">"hlasitost médií"</item>
+    <item msgid="5762123934816216821">"hlasitost budíku"</item>
+    <item msgid="785049718065337473">"hlasitost oznámení"</item>
+    <item msgid="6700305533746877052">"hlasitost Bluetooth"</item>
+    <item msgid="2029227495214047094">"Zakázat režim spánku"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Poloha"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Přehrávání zvuku"</item>
     <item msgid="136815868796597058">"Číst obsah schránky"</item>
     <item msgid="5238692940326972503">"Upravit obsah schránky"</item>
+    <item msgid="5753789168376302997">"Tlačítka médií"</item>
+    <item msgid="3265262911688671938">"Zaměření zvuku"</item>
+    <item msgid="2098976479485046797">"Hlavní hlasitost"</item>
+    <item msgid="5660213838861789350">"Hlasitost hlasu"</item>
+    <item msgid="7983336752371254444">"Hlasitost vyzvánění"</item>
+    <item msgid="7878027809189330917">"Hlasitost médií"</item>
+    <item msgid="7260546305036218513">"Hlasitost budíku"</item>
+    <item msgid="9103719301075748925">"Hlasitost oznámení"</item>
+    <item msgid="7025966722295861512">"Hlasitost Bluetooth"</item>
+    <item msgid="4665183401128289653">"Zakázat režim spánku"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátká"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Na obrazovce ve formě řádků"</item>
     <item msgid="120512413928262547">"V adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Vypnuto"</item>
+    <item msgid="7688197031296835369">"Zobrazit překreslované oblasti"</item>
+    <item msgid="8332661909019981149">"Zobrazit počítadlo překreslení"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardní limit"</item>
     <item msgid="4071574792028999443">"Procesy na pozadí deaktivovány"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 79e7506..4cc73fe 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Zadejte text, který se zobrazí na zamčené obrazovce"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Zobrazovat uživatele na uzamčené obrazovce"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Info o uživateli"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Zobrazit informace o profilu na obrazovce uzamčení"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informace o profilu"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Přístup k poloze"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Zabezpečení"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upravit síť"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Chcete-li zobrazit dostupné sítě, zapněte Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Vyhledávání sítí Wi-Fi…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nemáte oprávnění ke změně sítě Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Jiná síť…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Další"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. nastavení (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Přepněte klávesami ctrl+mezerník"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Výchozí"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Rozložení klávesnice"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Uživatelský slovník"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osobní slovník"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobní slovníky"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Osobní slovník"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Přidat"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Přidat do slovníku"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Výška"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Určuje rejstřík mluveného textu"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jazyk"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nebyl vybrán jazyk"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavení jazyka hlasu pro mluvený text"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Poslechnout příklad"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Přehrát krátkou ukázku syntézy řeči"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Zobrazení v oknech vykreslovaná s GPU blikají."</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Zobr. aktual. HW vrstev"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Aktualizované HW vrstvy nechat zeleně blikat"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Zobrazovat překreslení GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Od nejlepšího k nejhoršímu: modrá, zelená, světle červená, červená"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Ladění překreslování GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Zakázat HW vrstvy"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy použít GPU ke skládání obrazovky."</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Povolit trasování OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Uživatelé a profily"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Přidat uživatele nebo profil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Omezený profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Před vytvořením omezeného profilu je nutné nejprve nastavit zámek obrazovky k ochraně aplikací a dat."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Nastavit zámek"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Není nastaveno"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Není nastaveno – omezený profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Vlastník"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Přezdívka"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Přidat"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Uživatelé mají své vlastní aplikace a obsah."</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Omezené profily mohou přistupovat pouze k aplikacím a obsahu z vašich účtů."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Můžete omezit přístup k aplikacím a obsahu ze svého účtu"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Uživatel"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Omezený profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Přidat nového uživatele"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nyní ne"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Uživatele smí spravovat pouze vlastník tabletu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Uživatele smí spravovat pouze vlastník telefonu."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Pomocí omezených profilů nelze přidávat účty."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Smazat <xliff:g id="USER_NAME">%1$s</xliff:g> ze zařízení"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nový uživatel"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nový profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Chcete smazat sebe?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Chcete uživatele odebrat?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Odebrat profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Přijdete o místo a data v tomto tabletu. Tuto akci nelze vrátit zpět."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Přijdete o místo a data v tomto telefonu. Tuto akci nelze vrátit zpět."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Místo v paměti a data uživatele budou z tabletu smazána. Tuto akci nelze vrátit zpět."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Místo v paměti a data uživatele budou z telefonu smazána. Tuto akci nelze vrátit zpět."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Místo v paměti a data profilu budou z tabletu smazána. Tuto akci nelze vrátit zpět."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Místo v paměti a data profilu budou z telefonu smazána. Tuto akci nelze vrátit zpět."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Omezení aplikací a obsahu"</string>
     <string name="user_rename" msgid="8523499513614655279">"PŘEJMENOVAT"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Nastavit omezení aplikace"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Řízeno aplikací <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Tato aplikace v omezených profilech není podporována."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Tato aplikace má přístup k vašim účtům"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Sítě Wi‑Fi a mobilní sítě"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Povolit úpravu nastavení sítí Wi-Fi a mobilních sítí"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 1dd8178..e087ce8 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Placering"</item>
     <item msgid="255608127647030286">"Personlig"</item>
     <item msgid="4588829735729884491">"Beskeder"</item>
-    <item msgid="8971765125227378270">"Enhed"</item>
+    <item msgid="886742181977884584">"Medier"</item>
+    <item msgid="7924928667052300589">"Enhed"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"omtrentlig placering"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"afspil lyd"</item>
     <item msgid="8374996688066472414">"læs udklipsholder"</item>
     <item msgid="3045529469061083747">"rediger udklipsholder"</item>
+    <item msgid="5124443975763747838">"medieknapper"</item>
+    <item msgid="4547883971364273343">"lydfokusering"</item>
+    <item msgid="2603878814882344450">"generel lydstyrke"</item>
+    <item msgid="7136963238377062018">"lydstyrke for stemme"</item>
+    <item msgid="4270236897655923007">"lydstyrke for ringetone"</item>
+    <item msgid="6325739889222559394">"lydstyrke for medier"</item>
+    <item msgid="5762123934816216821">"alarmlydstyrke"</item>
+    <item msgid="785049718065337473">"lydstyrke for underretninger"</item>
+    <item msgid="6700305533746877052">"lydstyrke for bluetooth"</item>
+    <item msgid="2029227495214047094">"hold aktiv"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Placering"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Afspil lyd"</item>
     <item msgid="136815868796597058">"Læs udklipsholder"</item>
     <item msgid="5238692940326972503">"Rediger udklipsholder"</item>
+    <item msgid="5753789168376302997">"Medieknapper"</item>
+    <item msgid="3265262911688671938">"Lydfokusering"</item>
+    <item msgid="2098976479485046797">"Generel lydstyrke"</item>
+    <item msgid="5660213838861789350">"Lydstyrke for stemme"</item>
+    <item msgid="7983336752371254444">"Lydstyrke for ringetone"</item>
+    <item msgid="7878027809189330917">"Lydstyrke for medier"</item>
+    <item msgid="7260546305036218513">"Alarmlydstyrke"</item>
+    <item msgid="9103719301075748925">"Lydstyrke for underretninger"</item>
+    <item msgid="7025966722295861512">"Lydstyrke for bluetooth"</item>
+    <item msgid="4665183401128289653">"Hold aktiv"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"På skærmen som linier"</item>
     <item msgid="120512413928262547">"{0}Trans: left untranslated according to ws.{/0}{0} - daDA Wlgg 01/10/13 11:18{/0}"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Fra"</item>
+    <item msgid="7688197031296835369">"Vis områder med overlap"</item>
+    <item msgid="8332661909019981149">"Vis antallet af overlap"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgrænse"</item>
     <item msgid="4071574792028999443">"Ingen baggrundsprocesser"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fbabb0d..ccac6ba 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Indtast den tekst, der skal vises på den låste skærm"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Vis brugeroplysninger ved låst skærm"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Brugeroplysninger"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Vis profiloplysninger på låseskærmen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiloplysninger"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Placeringsadgang"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sikkerhed"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låsning af SIM-kort og lager for loginoplysninger"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Rediger netværk"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Se tilgængelige netværk ved at aktivere Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Søger efter Wi-Fi-netværk..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Du har ikke tilladelse til at ændre Wi-Fi-netværket."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Andre netværk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mere"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Tryk på Ctrl-Mellemrum for at skifte"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastaturlayout"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Brugerordbog"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personlig ordbog"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personlige ordbøger"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personlig ordbog"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Tilføj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Føj til ordbog"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonehøjde"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Påvirker tonen af den talte tekst"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Sprog"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Der er ikke valgt sprog"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Angiver det sprog, der skal bruges til oplæsning af tekst"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Lyt til et eksempel"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Afspil en kort demonstration af talesyntese"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Fremhæv visninger i vinduer, når de tegnes med GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Se opdat. af hardwarelag"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Hardwarelag blinker grønt, når de opdateres"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Vis GPU-overdraw"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Fra bedst til værst: blå, grøn, lys rød, rød"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Ret GPU-overlapsfejl"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Deaktiver HW-overlejring"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Brug altid GPU til skærmsammensætning"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktivér OpenGL-spor"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Brugere og profiler"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Tilføj en bruger eller en profil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Begrænset profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Før du kan oprette en begrænset profil, skal du oprette en skærmlås for at beskytte dine apps og personlige data."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Konfigurer låseskærmen"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ikke konfigureret"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Ikke oprettet – begrænset profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Ejer"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Kaldenavn"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Tilføj"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Brugere har egne apps og eget indhold"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Begrænsede profiler kan kun få adgang til apps og indhold fra dine konti"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Du kan begrænse adgangen til apps og indhold fra din konto"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Bruger"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begrænset profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Tilføj ny bruger"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ikke nu"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Kun ejeren af tabletten kan administrere brugere."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Kun ejeren af telefonen kan administrere brugere."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Begrænsede profiler kan ikke tilføje konti"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Slet <xliff:g id="USER_NAME">%1$s</xliff:g> fra denne enhed"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Ny bruger"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Ny profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vil du slette dig selv?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Vil du fjerne brugeren?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Vil du fjerne profilen?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Du vil miste din plads og dine data på denne tablet. Du kan ikke fortryde denne handling."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Du vil miste din plads og dine data på denne telefon. Du kan ikke fortryde denne handling."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Denne brugers plads og data vil forsvinde fra denne tablet. Du kan ikke fortryde denne handling."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Denne brugers plads og data vil forsvinde fra denne telefon. Du kan ikke fortryde denne handling."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Denne profils plads og data vil forsvinde fra denne tablet. Du kan ikke fortryde denne handling."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Denne profils plads og data vil forsvinde fra denne telefon. Du kan ikke fortryde denne handling."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Begrænsninger af apps og indhold"</string>
     <string name="user_rename" msgid="8523499513614655279">"OMDØB"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Angiv applikationsgrænser"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontrolleret af <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Denne app understøttes ikke for begrænsede profiler"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Denne app kan få adgang til dine konti"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi og mobil"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Tillad ændring af Wi-Fi- og mobilindstillinger"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 9035730..efd6f90 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Standort"</item>
     <item msgid="255608127647030286">"Persönlich"</item>
     <item msgid="4588829735729884491">"SMS/MMS"</item>
-    <item msgid="8971765125227378270">"Gerät"</item>
+    <item msgid="886742181977884584">"Medien"</item>
+    <item msgid="7924928667052300589">"Gerät"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"Ungefährer Standort"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"Audio wiedergeben"</item>
     <item msgid="8374996688066472414">"Zwischenablage lesen"</item>
     <item msgid="3045529469061083747">"Zwischenablage ändern"</item>
+    <item msgid="5124443975763747838">"Medienschaltflächen"</item>
+    <item msgid="4547883971364273343">"Audiofokus"</item>
+    <item msgid="2603878814882344450">"Gesamtlautstärke"</item>
+    <item msgid="7136963238377062018">"Sprachlautstärke"</item>
+    <item msgid="4270236897655923007">"Klingeltonlautstärke"</item>
+    <item msgid="6325739889222559394">"Medienlautstärke"</item>
+    <item msgid="5762123934816216821">"Weckerlautstärke"</item>
+    <item msgid="785049718065337473">"Benachrichtigungslautstärke"</item>
+    <item msgid="6700305533746877052">"Bluetooth-Lautstärke"</item>
+    <item msgid="2029227495214047094">"aktiv lassen"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Standort"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Audio wiedergeben"</item>
     <item msgid="136815868796597058">"Zwischenablage lesen"</item>
     <item msgid="5238692940326972503">"Zwischenablage ändern"</item>
+    <item msgid="5753789168376302997">"Medienschaltflächen"</item>
+    <item msgid="3265262911688671938">"Audiofokus"</item>
+    <item msgid="2098976479485046797">"Gesamtlautstärke"</item>
+    <item msgid="5660213838861789350">"Sprachlautstärke"</item>
+    <item msgid="7983336752371254444">"Klingeltonlautstärke"</item>
+    <item msgid="7878027809189330917">"Medienlautstärke"</item>
+    <item msgid="7260546305036218513">"Weckerlautstärke"</item>
+    <item msgid="9103719301075748925">"Benachrichtigungslautstärke"</item>
+    <item msgid="7025966722295861512">"Bluetooth-Lautstärke"</item>
+    <item msgid="4665183401128289653">"Aktiv lassen"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kurz"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Auf Bildschirm als Linien"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Aus"</item>
+    <item msgid="7688197031296835369">"Überschneidungsbereiche anzeigen"</item>
+    <item msgid="8332661909019981149">"Überschneidungszähler anzeigen"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardlimit"</item>
     <item msgid="4071574792028999443">"Keine Hintergrundprozesse"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5245794..dc48134 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Text für Sperrbildschirm eingeben"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Nutzerinformationen bei Bildschirmsperre anzeigen"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Nutzerinformationen"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Profilinformationen auf Sperrbildschirm anzeigen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profilinformationen"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Standortzugriff"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sicherheit"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldeinformationsspeicher festlegen"</string>
@@ -573,8 +575,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netzwerk ändern"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"WLAN aktivieren, um verfügbare Netze abzurufen"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Suche nach WLAN-Netzwerken läuft…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Sie verfügen nicht über die Berechtigung zum Ändern des WLAN-Netzwerks."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Anderes Netzwerk…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mehr"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisches Setup (WPS)"</string>
@@ -1235,9 +1236,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Drücken Sie zum Wechseln Strg+Leertaste."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastaturlayouts"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Mein Wörterbuch"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Mein Wörterbuch"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Persönliche Wörterbücher"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Mein Wörterbuch"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Hinzufügen"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Ins Wörterbuch"</string>
@@ -1457,6 +1456,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonlage"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Beeinflusst den Klang des gesprochenen Textes"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Sprache"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Keine Sprache ausgewählt"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Legt die sprachspezifische Stimme für den gesprochenen Text fest"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Beispiel anhören"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Kurze Demonstration der Sprachsynthese abspielen"</string>
@@ -1673,8 +1673,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash-Ansicht im Fenster, wenn mit GPU dargestellt"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Hardwareebenen-Updates"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Hardwareebenen blinken beim Aktualisieren grün"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"GPU-Überlastung anzeigen"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Niedrig nach hoch: blau, grün, hellrot, rot"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Debugging – GPU-Überschneidung"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW-Overlays deaktivieren"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"GPU immer für Bildschirmaufbau verwenden"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL-Traces aktivieren"</string>
@@ -1827,6 +1826,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Nutzer &amp; Profile"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Nutzer oder Profil hinzufügen"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Eingeschränktes Profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Vor dem Erstellen eines eingeschränkten Profils müssen Sie eine Display-Sperre einrichten, um Ihre Apps und personenbezogenen Daten zu schützen."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Sperre einrichten"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nicht eingerichtet"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Eingeschränktes Profil nicht eingerichtet"</string>
     <string name="user_owner" msgid="3879126011135546571">"Eigentümer"</string>
@@ -1834,7 +1835,8 @@
     <string name="user_nickname" msgid="5148818000228994488">"Alias"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Hinzufügen"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Die Nutzer haben eigene Apps und Inhalte."</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Eingeschränkte Profile können nur auf die Apps und Inhalte aus Ihren Konten zugreifen."</string>
+    <!-- no translation found for user_add_profile_item_summary (5931663986889138941) -->
+    <skip />
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Nutzer"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Eingeschränkte Profile"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Neuen Nutzer hinzufügen"</string>
@@ -1847,23 +1849,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nicht jetzt"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Nur der Besitzer des Tablets kann Nutzer verwalten."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Nur der Besitzer des Telefons kann Nutzer verwalten."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"In eingeschränkten Profilen können keine Konten hinzugefügt werden."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> vom Gerät löschen"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Neuer Nutzer"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Neues Profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Sich selbst löschen?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Nutzer entfernen?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Profil entfernen?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Ihr Profil und Ihre Daten werden vom Tablet entfernt. Sie können diese Aktion nicht rückgängig machen."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Ihr Profil und Ihre Daten werden vom Telefon entfernt. Sie können diese Aktion nicht rückgängig machen."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Das Profil und die Daten dieses Nutzers werden vom Tablet entfernt. Sie können diese Aktion nicht rückgängig machen."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Das Profil und die Daten dieses Nutzers werden vom Telefon entfernt. Sie können diese Aktion nicht rückgängig machen."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Das Profil und die zugehörigen Daten werden vom Tablet entfernt. Sie können diese Aktion nicht rückgängig machen."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Das Profil und die zugehörigen Daten werden vom Telefon entfernt. Sie können diese Aktion nicht rückgängig machen."</string>
     <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>
@@ -1880,12 +1878,12 @@
     <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>
+    <!-- no translation found for user_restrictions_title (7745810037152772035) -->
+    <skip />
     <string name="user_rename" msgid="8523499513614655279">"Umbenennen"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"App-Grenzen festlegen"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Von <xliff:g id="APP">%1$s</xliff:g> festgelegt"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Diese App wird in eingeschränkten Profilen nicht unterstützt."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Diese App darf auf Ihre Konten zugreifen."</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"WLAN und mobile Nutzung"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Änderungen an Einstellungen für WLAN und mobile Nutzung zulassen"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 6a2ceb1..eea4e51 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Τοποθεσία"</item>
     <item msgid="255608127647030286">"Προσωπικό"</item>
     <item msgid="4588829735729884491">"Ανταλλαγή μηνυμάτων"</item>
-    <item msgid="8971765125227378270">"Συσκευή"</item>
+    <item msgid="886742181977884584">"Μέσα"</item>
+    <item msgid="7924928667052300589">"Συσκευή"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"τοποθεσία κατά προσέγγιση"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"αναπαραγωγή ήχου"</item>
     <item msgid="8374996688066472414">"ανάγνωση περιεχόμενων προχείρου"</item>
     <item msgid="3045529469061083747">"τροποποίηση περιεχομένων προχείρου"</item>
+    <item msgid="5124443975763747838">"κουμπιά μέσων"</item>
+    <item msgid="4547883971364273343">"εστίαση ήχου"</item>
+    <item msgid="2603878814882344450">"κύρια ένταση ήχου"</item>
+    <item msgid="7136963238377062018">"έντασης ήχου φωνής"</item>
+    <item msgid="4270236897655923007">"ένταση ήχου κλήσης"</item>
+    <item msgid="6325739889222559394">"ένταση ήχου μέσων"</item>
+    <item msgid="5762123934816216821">"ένταση ήχου ξυπνητηριού"</item>
+    <item msgid="785049718065337473">"ένταση ήχου ειδοποιήσεων"</item>
+    <item msgid="6700305533746877052">"ένταση ήχου Bluetooth"</item>
+    <item msgid="2029227495214047094">"διατήρηση λειτουργίας"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Τοποθεσία"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Αναπαραγωγή ήχου"</item>
     <item msgid="136815868796597058">"Ανάγνωση περιεχομένων προχείρου"</item>
     <item msgid="5238692940326972503">"Τροποποίηση περιεχομένων προχείρου"</item>
+    <item msgid="5753789168376302997">"Κουμπιά μέσων"</item>
+    <item msgid="3265262911688671938">"Εστίαση ήχου"</item>
+    <item msgid="2098976479485046797">"Κύρια ένταση ήχου"</item>
+    <item msgid="5660213838861789350">"Έντασης ήχου φωνής"</item>
+    <item msgid="7983336752371254444">"Ένταση ήχου κλήσης"</item>
+    <item msgid="7878027809189330917">"Ένταση ήχου πολυμέσων"</item>
+    <item msgid="7260546305036218513">"Ένταση ήχου ξυπνητηριού"</item>
+    <item msgid="9103719301075748925">"Ένταση ήχου ειδοποιήσεων"</item>
+    <item msgid="7025966722295861512">"Ένταση ήχου Bluetooth"</item>
+    <item msgid="4665183401128289653">"Διατήρηση λειτουργίας"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Σύντομο"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Στην οθόνη ως γραμμές"</item>
     <item msgid="120512413928262547">"Σε adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Ανενεργές"</item>
+    <item msgid="7688197031296835369">"Εμφάνιση περιοχών υπέρβασης"</item>
+    <item msgid="8332661909019981149">"Εμφάνιση μετρητή υπέρβασης"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Τυπικό όριο"</item>
     <item msgid="4071574792028999443">"Δεν υπάρχουν διεργασίες παρασκηνίου"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 15ca6c9..bd18b7b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Εισάγετε κείμενο για εμφάνιση σε οθόνη κλειδώματος"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Εμφάνιση πληροφοριών χρήστη στην οθόνη κλειδώματος"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Πληροφορίες χρήστη"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Εμφάνιση πληροφοριών προφίλ στην οθόνη κλειδώματος"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Πληροφορίες προφίλ"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Πρόσβαση τοποθεσίας"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Ασφάλεια"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Τροποποίηση δικτύου"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Για διαθέσιμα δίκτυα, ενεργοποιήστε το Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Αναζήτηση για δίκτυα Wi-Fi…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Δεν έχετε άδεια για αλλαγή του δικτύου Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Άλλο δίκτυο…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Περισσότερα"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Αυτόματη ρύθμιση (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Για εναλ., πατ. Control-Πληκ.διαστ."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Προεπιλογή"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Διατάξεις πληκτρολογίου"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Λεξικό χρήστη"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Προσωπικό λεξικό"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Προσωπικά λεξικά"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Προσωπικό λεξικό"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Προσθήκη"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Προσθήκη στο λεξικό"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Τόνος"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Επηρεάζει τον τόνο του προφορικού κειμένου"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Γλώσσα"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Δεν έχει επιλεγεί γλώσσα"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ορίζει τη φωνή που σχετίζεται με τη γλώσσα για το κείμενο ομιλίας"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ακούστε ένα παράδειγμα"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Αναπαραγωγή μιας σύντομης αναπαράστασης σύνθεσης λόγου"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Προβολές Flash εντός παραθύρων όταν γίνεται σχεδιασμός με το GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Εμφ. ενημ. επιπ. υλικού"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Επισήμ. επιπέδων υλικού με πράσινο κατά την ενημ."</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Εμφάνιση μεγέθους υπερανάληψης σε GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Από το καλύτερο στο χειρότερο: μπλε, πράσινο, απαλό κόκκινο, κόκκινο"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Κατάρ.σφαλμ.υπέρβ.GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Απενεργ. επικαλύψεων HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Να γίνεται πάντα χρήση του GPU για σύνθεση οθόνης"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ενεργοποίηση ιχνών OpenGL"</string>
@@ -1689,7 +1688,7 @@
     <string name="track_frame_time" msgid="6146354853663863443">"Απόδοση GPU προφίλ"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Κλίμακα κίνησης παραθύρου"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Κλίμακα κίνησης μετάβασης"</string>
-    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator duration scale"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Κλίμ. διάρ. Animator"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Προσομ. δευτερ. προβολών"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Εφαρμογές"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Μη διατήρ. δραστηριοτήτων"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Χρήστες και προφίλ"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Προσθήκη χρήστη ή προφίλ"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Προφίλ περιορισμένης πρόσβασης"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Προκειμένου να μπορέσετε να δημιουργήσετε ένα περιορισμένο προφίλ, θα πρέπει να δημιουργήσετε ένα κλείδωμα οθόνης για την προστασία των εφαρμογών και των προσωπικών δεδομένων σας."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Ορισμός κλειδώματος"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Δεν υπάρχει ρύθμιση"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Δεν έχει ρυθμιστεί - Προφίλ περιορισμένης πρόσβασης"</string>
     <string name="user_owner" msgid="3879126011135546571">"Κάτοχος"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Ψευδώνυμο"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Προσθήκη"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Οι χρήστες διαθέτουν τις δικές τους εφαρμογές και περιεχόμενο"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Τα προφίλ περιορισμένης πρόσβασης μπορούν να έχουν πρόσβαση μόνο στις εφαρμογές και το περιεχόμενο από τους λογαριασμούς σας"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Μπορείτε να περιορίσετε την πρόσβαση σε εφαρμογές και περιεχόμενο από το λογαριασμό σας"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Χρήστης"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Προφίλ περιορ. πρόσβασης"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Προσθήκη νέου χρήστη"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Όχι τώρα"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Μόνο ο κάτοχος του tablet μπορεί να διαχειριστεί χρήστες."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Μόνο ο κάτοχος του τηλεφώνου μπορεί να διαχειριστεί χρήστες."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Δεν είναι δυνατή η προσθήκη λογαριασμών από περιορισμένα προφίλ"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Διαγρ. <xliff:g id="USER_NAME">%1$s</xliff:g> από τη συσκ."</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Νέος χρήστης"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Νέο προφίλ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Διαγραφή του εαυτού σας;"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Κατάργηση χρήστη;"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Κατάργηση προφίλ;"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Θα χάσετε τον χώρο και τα δεδομένα σας σε αυτό το tablet. Δεν είναι δυνατό να αναιρέσετε αυτήν την ενέργεια."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Θα χάσετε τον χώρο και τα δεδομένα σας σε αυτό το τηλέφωνο. Δεν είναι δυνατό να αναιρέσετε αυτήν την ενέργεια."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Ο χώρος και τα δεδομένα αυτού του χρήστη θα εξαφανιστούν από αυτό το tablet. Δεν είναι δυνατό να αναιρέσετε αυτήν την ενέργεια."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Ο χώρος και τα δεδομένα αυτού του χρήστη θα εξαφανιστούν από αυτό το τηλέφωνο. Δεν είναι δυνατό να αναιρέσετε αυτήν την ενέργεια."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Ο χώρος και τα δεδομένα αυτού του προφίλ θα εξαφανιστούν από το tablet. Δεν είναι δυνατό να αναιρέσετε αυτήν την ενέργεια."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Ο χώρος και τα δεδομένα αυτού του προφίλ θα εξαφανιστούν από το τηλέφωνο. Δεν είναι δυνατό να αναιρέσετε αυτήν την ενέργεια."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Περιορισμοί εφαρμογών, περιεχομένου"</string>
     <string name="user_rename" msgid="8523499513614655279">"ΜΕΤΟΝΟΜΑΣΙΑ"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Ορισμός ορίων εφαρμογής"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Ελέγχονται από την εφαρμογή <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Αυτή η εφαρμογή δεν υποστηρίζεται σε περιορισμένα προφίλ"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Αυτή η εφαρμογή μπορεί να αποκτήσει πρόσβαση στους λογαριασμούς σας"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi και κινητά"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Να επιτρέπεται η τροποποίηση των ρυθμίσεων Wi‑Fi και κινητών"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 6576fa7..a942642 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Location"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Messaging"</item>
-    <item msgid="8971765125227378270">"Device"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Device"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"coarse location"</item>
@@ -246,7 +247,7 @@
     <item msgid="6546959730920410907">"modify call log"</item>
     <item msgid="446877710771379667">"read calendar"</item>
     <item msgid="7674458294386319722">"modify calendar"</item>
-    <item msgid="8281201165558093009">"wi-fi scan"</item>
+    <item msgid="8281201165558093009">"Wi-Fi scan"</item>
     <item msgid="8694611243479480497">"notification"</item>
     <item msgid="7776439107987345446">"cell scan"</item>
     <item msgid="514615766544675057">"call phone"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"play audio"</item>
     <item msgid="8374996688066472414">"read clipboard"</item>
     <item msgid="3045529469061083747">"modify clipboard"</item>
+    <item msgid="5124443975763747838">"media buttons"</item>
+    <item msgid="4547883971364273343">"audio focus"</item>
+    <item msgid="2603878814882344450">"master volume"</item>
+    <item msgid="7136963238377062018">"voice volume"</item>
+    <item msgid="4270236897655923007">"ring volume"</item>
+    <item msgid="6325739889222559394">"media volume"</item>
+    <item msgid="5762123934816216821">"alarm volume"</item>
+    <item msgid="785049718065337473">"notification volume"</item>
+    <item msgid="6700305533746877052">"Bluetooth volume"</item>
+    <item msgid="2029227495214047094">"keep awake"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Location"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Play audio"</item>
     <item msgid="136815868796597058">"Read clipboard"</item>
     <item msgid="5238692940326972503">"Modify clipboard"</item>
+    <item msgid="5753789168376302997">"Media buttons"</item>
+    <item msgid="3265262911688671938">"Audio focus"</item>
+    <item msgid="2098976479485046797">"Master volume"</item>
+    <item msgid="5660213838861789350">"Voice volume"</item>
+    <item msgid="7983336752371254444">"Ring volume"</item>
+    <item msgid="7878027809189330917">"Media volume"</item>
+    <item msgid="7260546305036218513">"Alarm volume"</item>
+    <item msgid="9103719301075748925">"Notification volume"</item>
+    <item msgid="7025966722295861512">"Bluetooth volume"</item>
+    <item msgid="4665183401128289653">"Keep awake"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Short"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"On screen as lines"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Off"</item>
+    <item msgid="7688197031296835369">"Show overdraw areas"</item>
+    <item msgid="8332661909019981149">"Show overdraw counter"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standard limit"</item>
     <item msgid="4071574792028999443">"No background processes"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b36faa4..3fec9d8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Type text to display on the lock screen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Show user info on lock screen"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"User info"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Show profile info on lock screen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profile info"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Location access"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Security"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modify network"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"To see available networks, turn Wi‑Fi on."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Searching for Wi‑Fi networks…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"You don\'t have permission to change the Wi‑Fi network."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Other network…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"More"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatic setup (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"To switch, press Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Keyboard layouts"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"User dictionary"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personal dictionary"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personal dictionaries"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personal dictionary"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Add"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Add to dictionary"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affects the tone of the spoken text"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Language"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Language not selected"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Sets the language-specific voice for the spoken text"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Listen to an example"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Play a short demonstration of speech synthesis"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash views inside windows when drawn with the GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Show hardware layers updates"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Flash hardware layers green when they update"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Show GPU overdraw"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"From best to worst: blue, green, light red, red"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Debug GPU overdraw"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Disable HW overlays"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Always use GPU for screen compositing"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Enable OpenGL traces"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Users &amp; profiles"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Add user or profile"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Restricted profile"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Set lock"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Not set up"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Not set up - Restricted profile"</string>
     <string name="user_owner" msgid="3879126011135546571">"Owner"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Nickname"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Add"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Users have their own apps and content"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Restricted profiles can only access the apps and content from your accounts"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"You can restrict access to apps and content from your account"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"User"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Restricted profile"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Add new user"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Not now"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Only the tablet\'s owner can manage users."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Only the phone\'s owner can manage users."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Restricted profiles cannot add accounts"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Delete <xliff:g id="USER_NAME">%1$s</xliff:g> from this device"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"New user"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"New profile"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Delete yourself?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Remove user?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Remove profile?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"You will lose your space and data on this tablet. You can\'t undo this action."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"You will lose your space and data on this phone. You can\'t undo this action."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"This user\'s space and data will disappear from this tablet. You can\'t undo this action."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"This user\'s space and data will disappear from this phone. You can\'t undo this action."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"This profile\'s space and data will disappear from this tablet. You can\'t undo this action."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"This profile\'s space and data will disappear from this phone. You can\'t undo this action."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Application and content restrictions"</string>
     <string name="user_rename" msgid="8523499513614655279">"RENAME"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Set application limits"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlled by <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"This app is not supported in restricted profiles"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"This app can access your accounts"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi and Mobile"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Allow modification of Wi‑Fi and Mobile settings"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index b1d7655..b198a4f 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Ubicación"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Mensajería"</item>
-    <item msgid="8971765125227378270">"Dispositivo"</item>
+    <item msgid="886742181977884584">"Medios"</item>
+    <item msgid="7924928667052300589">"Dispositivo"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ubicación aproximada"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"reproducir audio"</item>
     <item msgid="8374996688066472414">"leer portapapeles"</item>
     <item msgid="3045529469061083747">"modificar portapapeles"</item>
+    <item msgid="5124443975763747838">"botones de medios"</item>
+    <item msgid="4547883971364273343">"enfoque de audio"</item>
+    <item msgid="2603878814882344450">"volumen principal"</item>
+    <item msgid="7136963238377062018">"volumen de voz"</item>
+    <item msgid="4270236897655923007">"volumen de tono"</item>
+    <item msgid="6325739889222559394">"volumen de medios"</item>
+    <item msgid="5762123934816216821">"volumen de alarma"</item>
+    <item msgid="785049718065337473">"volumen de notificación"</item>
+    <item msgid="6700305533746877052">"volumen de bluetooth"</item>
+    <item msgid="2029227495214047094">"mantener en funcionamiento"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ubicación"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Reproducir audio"</item>
     <item msgid="136815868796597058">"Leer portapapeles"</item>
     <item msgid="5238692940326972503">"Modificar portapapeles"</item>
+    <item msgid="5753789168376302997">"Botones de medios"</item>
+    <item msgid="3265262911688671938">"Enfoque de audio"</item>
+    <item msgid="2098976479485046797">"Volumen principal"</item>
+    <item msgid="5660213838861789350">"Volumen de voz"</item>
+    <item msgid="7983336752371254444">"Volumen de tono"</item>
+    <item msgid="7878027809189330917">"Volumen de medios"</item>
+    <item msgid="7260546305036218513">"Volumen de alarma"</item>
+    <item msgid="9103719301075748925">"Volumen de notificación"</item>
+    <item msgid="7025966722295861512">"Volumen de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mantener en funcionamiento"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"En pantalla como líneas"</item>
     <item msgid="120512413928262547">"En adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Desactivado"</item>
+    <item msgid="7688197031296835369">"Mostrar áreas superpuestas"</item>
+    <item msgid="8332661909019981149">"Mostrar contador de superposiciones"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límite estándar"</item>
     <item msgid="4071574792028999443">"Ningún proceso en 2do plano"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 20c6875..6d3707f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -23,11 +23,11 @@
     <string name="deny" msgid="6947806159746484865">"Rechazar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
   <plurals name="show_dev_countdown">
-    <item quantity="one" msgid="5295687242294085452">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> paso de ser un programador."</item>
-    <item quantity="other" msgid="6722953419953594148">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos de ser un programador."</item>
+    <item quantity="one" msgid="5295687242294085452">"Estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> paso de ser programador."</item>
+    <item quantity="other" msgid="6722953419953594148">"Estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos de ser programador."</item>
   </plurals>
-    <string name="show_dev_on" msgid="1110711554982716293">"Ahora eres un programador."</string>
-    <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres un programador."</string>
+    <string name="show_dev_on" msgid="1110711554982716293">"¡Ya eres programador!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres programador."</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>
@@ -123,7 +123,7 @@
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"Configuración del perfil"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"No se ha establecido ningún nombre; se utiliza el nombre de cuenta"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Buscar dispositivos"</string>
-    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Cambiar el nombre de tableta"</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Cambiar el nombre de tablet"</string>
     <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Cambiar nombre del dispositivo"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Cambiar nombre"</string>
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
@@ -149,13 +149,13 @@
     <string name="device_picker" msgid="8398232791303186677">"Selector de dispositivos Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Una aplicación desea activar el Bluetooth."</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Una aplicación quiere hacer visible tu tableta para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Una aplicación quiere hacer visible tu dispositivo para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicación quiere hacer visible tu tableta para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Una aplicación quiere hacer visible tu dispositivo para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Una aplicación quiere activar el Bluetooth y hacer visible tu tableta para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Una aplicación quiere activar el Bluetooth y hacer visible tu tablet para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Una aplicación quiere activar el Bluetooth y hacer visible tu dispositivo para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Una aplicación quiere activar el Bluetooth y hacer visible tu tableta 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="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 dispositivo 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">"¿Desactivar Bluetooth?"</string>
@@ -184,7 +184,7 @@
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Saltar proxy para"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar configuraciones predeterminadas"</string>
-    <string name="proxy_action_text" msgid="2957063145357903951">"Finalizado"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Finalizar"</string>
     <string name="proxy_hostname_label" msgid="8490171412999373362">"Nombre de host proxy"</string>
     <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atención"</string>
@@ -267,7 +267,7 @@
     <string name="settings_shortcut" msgid="3936651951364030415">"Configuración"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo avión"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Más..."</string>
-    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes inalámbricas y redes"</string>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Conexiones inalámbricas y redes"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Administrar Wi-Fi, Bluetooth, modo avión, redes móviles y VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de datos"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Conectar a servicios de datos en roaming"</string>
@@ -275,7 +275,7 @@
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Has perdido la conectividad de los datos porque has dejado la red doméstica con roaming de datos desactivado."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Enciéndelo"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Al permitir el roaming de datos, puedes incurrir en gastos de roaming importantes."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Al permitir el roaming de datos, los costos de roaming que deberás asumir pueden ser altos."\n\n"Esta configuración afecta a todos los usuarios de esta tableta."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Al permitir el roaming de datos, los costos de roaming que deberás asumir pueden ser altos."\n\n"Esta configuración afecta a todos los usuarios de esta tablet."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Al permitir el roaming de datos, los costos de roaming que deberás asumir pueden ser altos."\n\n"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"¿Deseas permitir el roaming de datos?"</string>
     <string name="networks" msgid="6333316876545927039">"Selección de operador"</string>
@@ -309,35 +309,37 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ingresa el texto para la pantalla bloqueada."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar datos de usuario en pantalla bloqueada"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Datos de usuario"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar datos del perfil en pantalla bloqueada"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Datos del perfil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Acceso a la ubicación"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar Tableta"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar Tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar dispositivo"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesitas un PIN numérico o contraseña para descifrar tu tableta cada vez que la enciendes"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesitas un PIN numérico o contraseña para descifrar tu tablet cada vez que la enciendes"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Se necesita un PIN numérico o contraseña para descifrar tu dispositivo cada vez que lo enciendes"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Una vez que hayas encriptado la tableta, debes ingresar un PIN o una contraseña numérica para desencriptarla cada vez que la enciendas. No puedes desencriptar tu tableta a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener la tableta conectada hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Una vez que hayas encriptado la tablet, debes ingresar un PIN o una contraseña numérica para desencriptarla cada vez que la enciendas. No puedes desencriptar tu tablet a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener la tablet conectada hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Luego de encriptar tu dispositivo, tienes que escribir un PIN o contraseña numéricos cada vez que lo enciendes para desencriptarlo. No puedes desencriptar tu dispositivo a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener el dispositivo conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tableta"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar dispositivo"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carga tu batería e inténtalo nuevamente."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Enchufa tu cargador e inténtalo nuevamente."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Sin contraseña o PIN de pantalla de bloqueo"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Debes configurar una contraseña o PIN de pantalla de bloqueo antes de comenzar con la encriptación."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"¿Deseas encriptar el dispositivo?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, la tableta se reiniciará varias veces."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, la tablet se reiniciará varias veces."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, el dispositivo se reiniciará varias veces."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptando"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Espera mientras se encripta tu tableta. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Espera mientras se encripta tu tablet. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Espera mientras se encripta tu dispositivo. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Vuelve a intentarlo en <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escribe la contraseña"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptación incorrecta"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu tableta. "\n\n" Para reanudar el uso de tu tableta, debes restablecer los datos de fábrica. Cuando configures tu tableta luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu tablet. "\n\n" Para reanudar el uso de tu tablet, debes restablecer los datos de fábrica. Cuando configures tu tablet luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu dispositivo. "\n\n"Para reanudar el uso de tu dispositivo, debes restablecer los datos de fábrica. Cuando configures tu dispositivo luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar método de introducción"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elegir bloqueo pant."</string>
@@ -523,7 +525,7 @@
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desactivada"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Inhabilitada"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir el intercambio de datos cuando la tableta entre en contacto con otro dispositivo"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir el intercambio de datos cuando la tablet entre en contacto con otro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir el intercambio de datos cuando el dispositivo toque otro dispositivo"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Listo para transmitir el contenido de la aplicación a través de NFC"</string>
@@ -553,7 +555,7 @@
     <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>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <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_text_location_off" msgid="6323983741393280935">"Las aplicaciones pueden buscar redes cercanas incluso cuando Wi-Fi esté desactivado. Si no quieres que esto ocurra, ve a Config. avanzada &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">"Mantener Wi-Fi durante suspensión"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Hubo un problema mientras se cambiaba la configuración"</string>
@@ -572,12 +574,11 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar la red"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para ver las redes disponibles, activa Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Buscando redes Wi-Fi…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"No tienes permiso para cambiar la red Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Otra red…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Más"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuración automática (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="4080969509965288881">"Tu tableta debe tener acceso a Wi-Fi para que puedas completar la configuración. Una vez finalizada, podrás alternar entre la conexión Wi-Fi y la conexión de datos para celulares."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Tu tablet debe tener acceso a Wi-Fi para que puedas completar la configuración. Una vez finalizada, podrás alternar entre la conexión Wi-Fi y la conexión de datos para celulares."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar las opciones avanzadas"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Configuración Wi-Fi protegida"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando la WPS…"</string>
@@ -631,11 +632,11 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Omitir de todos modos"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"No omitir"</string>
-    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ADVERTENCIA: Es posible que tu proveedor te cobre cargos adicionales por el uso de datos."\n\n"La configuración de la tableta puede requerir una significativa actividad de la red."</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ADVERTENCIA: Es posible que tu proveedor te cobre cargos adicionales por el uso de datos."\n\n"La configuración de la tablet puede requerir una significativa actividad de la red."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVERTENCIA: Es posible que tu proveedor te cobre cargos adicionales por el uso de datos."\n\n"La configuración del dispositivo puede requerir una significativa actividad de la red."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ADVERTENCIA: Hasta que no te conectes a Internet, la tableta no podrá verificar si el software está actualizado."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ADVERTENCIA: Hasta que no te conectes a Internet, la tablet no podrá verificar si el software está actualizado."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ADVERTENCIA: Hasta que no te conectes a Internet, el dispositivo no podrá verificar si el software está actualizado."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"La tableta no pudo conectarse a esta red Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"La tablet no pudo conectarse a esta red Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"El dispositivo no pudo conectarse a esta red Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Config. avanzada de Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Banda de frecuencia Wi-Fi"</string>
@@ -719,7 +720,7 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"El dispositivo no se encuentra en la base"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configuración para la base adjunta"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"No se encontró la base"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Debes acoplar la tableta antes de configurar el audio del conector."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Debes acoplar la tablet antes de configurar el audio del conector."</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Debes acoplar el dispositivo antes de configurar el audio del conector."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Sonido al insertar el conector"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproducir sonido cuando se inserte o elimine el tablet de la base."</string>
@@ -862,8 +863,8 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmontaje en progreso"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Poco espacio de almacenamiento"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Es posible que algunas funciones del sistema, como la sincronización, no funcionen correctamente. Intenta eliminar o a desactivar elementos para liberar espacio (por ejemplo, aplicaciones o contenido multimedia)."</string>
-    <string name="storage_menu_usb" msgid="5708207885333243384">"Conexión de computadora USB"</string>
-    <string name="storage_title_usb" msgid="679612779321689418">"Conexión de computadora USB"</string>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Conexión con comput. por USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Conexión con comput. por USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectarse como"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo multimedia (MTP)"</string>
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Te permite transferir archivos multimedia en Windows o a través de la aplicación Android File Transfer en Mac (visita www.android.com/filetransfer)."</string>
@@ -915,9 +916,9 @@
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Se ha restablecido la configuración predeterminada de APN."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecer valores de fábrica"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Borra todos los datos de la tableta"</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Borra todos los datos de la tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Borra todos los datos del dispositivo"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tableta, por ejemplo:"\n\n<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de las aplicaciones"</li>\n<li>"las aplicaciones descargadas"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, por ejemplo:"\n\n<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de las aplicaciones"</li>\n<li>"las aplicaciones descargadas"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del dispositivo, por ejemplo:"\n\n<li>"tu cuenta de Google,"</li>\n<li>"datos de aplicaciones y ajustes del sistema,"</li>\n<li>"las aplicaciones descargadas."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente has accedido a las siguientes cuentas:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
@@ -927,7 +928,7 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Eliminar la tarjeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Borra todos los datos del almacenamiento USB, como la música o las fotos."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borra todos los datos de la tarjeta SD, como música o fotos."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer la tableta"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer la tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer dispositivo"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"¿Deseas eliminar toda tu información personal y aplicaciones descargadas? Esta acción no se puede deshacer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Eliminar todo"</string>
@@ -978,11 +979,11 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Ubicación de WiFi y red móvil"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Ubicación de Wi-Fi y red móvil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación (se enviarán datos anónimos a Google)"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicación determinada por Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satélites de GPS"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permitir que las aplicaciones usen el sistema GPS de tu tableta para determinar tu ubicación"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permitir que las aplicaciones usen el sistema GPS de tu tablet para determinar tu ubicación"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Permitir que las aplicaciones usen el sistema GPS de tu dispositivo para determinar tu ubicación"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS asistido"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar el servidor para asistir el GPS (anular la selección para reducir el uso de la red)"</string>
@@ -1055,7 +1056,7 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Configuración de aplicación"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fuentes desconocidas"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"Permitir la instalación de aplicaciones provenientes de fuentes desconocidas"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tu tableta y datos personales son más vulnerables a los ataques de aplicaciones de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño a tu tableta o pérdida de datos que puedan producirse por el uso de estas aplicaciones."</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tu tablet y datos personales son más vulnerables a los ataques de aplicaciones de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño a tu tablet o pérdida de datos que puedan producirse por el uso de estas aplicaciones."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Tu dispositivo y datos personales son más vulnerables a los ataques de aplicaciones de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño a tu dispositivo o pérdida de datos que pueda producirse por el uso de estas aplicaciones."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verificar aplicaciones"</string>
     <string name="verify_applications_summary" msgid="6737505521913263792">"No permitir o advertir antes de instalar aplicaciones que puedan ocasionar daños"</string>
@@ -1128,9 +1129,9 @@
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Se desinstalarán todas las actualizaciones de esta aplicación del sistema Android."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Eliminar datos"</string>
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"No se pudieron borrar los datos de la aplicación."</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Esta aplicación puede acceder a los siguientes elementos de tu tableta:"</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Esta aplicación puede acceder a los siguientes elementos de tu tablet:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Esta aplicación puede acceder a los siguientes elementos del dispositivo:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Esta aplicación puede acceder a la siguiente información de tu tableta. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles en <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Esta aplicación puede acceder a la siguiente información de tu tablet. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles en <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Esta aplicación puede acceder a los siguientes elementos de tu dispositivo. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles en <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> y <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> y <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
@@ -1203,7 +1204,7 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"El servicio <xliff:g id="COMP_NAME">%1$s</xliff:g> está en uso."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"El proveedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está en uso."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"¿Deseas detener el servicio?"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Si detienes este servicio, algunas funciones de la tableta podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Si detienes este servicio, algunas funciones de la tablet podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si detienes este servicio, algunas funciones del dispositivo podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
     <string name="language_settings" msgid="5292716747264442359">"Teclado e idioma"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Teclado e idioma"</string>
@@ -1224,7 +1225,7 @@
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Configuración"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
     <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Se produjo un error al abrir la configuración de <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>."</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
+    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse y panel táctil"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidad del puntero"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de juegos"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibración"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para cambiar, presiona Ctrl+espacio."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predeterminado"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Diseños de teclado"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario del usuario"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionario personal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Diccionarios personales"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Diccionario personal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Agregar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Agregar al diccionario"</string>
@@ -1345,7 +1344,7 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliación de pantalla"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizar automáticamente la ampliación de pantalla"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualizar la ampliación de pantalla al cambiar de aplicaciones"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"El botón de encendido finaliza la llamada."</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botón de encend. corta la llamada"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Decir contraseñas"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Retraso entre tocar y mantener presionado"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configuración"</string>
@@ -1399,7 +1398,7 @@
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantener en funcionamiento"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi en funcionamiento"</string>
-    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tableta"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Teléfono"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Datos enviados"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Datos recibidos"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Sonido"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta el tono del texto hablado"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma no seleccionado"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Establece la voz específica de un idioma para el texto hablado"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Escucha un ejemplo:"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproducir una pequeña demostración de síntesis de voz"</string>
@@ -1627,9 +1627,9 @@
     <string name="header_add_an_account" msgid="756108499532023798">"Agregar una cuenta"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Finalizar"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"¿Deseas eliminar la cuenta?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Si eliminas esta cuenta, se eliminarán todos sus mensajes, contactos y otros datos de la tableta."</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Si eliminas esta cuenta, se eliminarán todos sus mensajes, contactos y otros datos de la tablet."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Si eliminas esta cuenta, se eliminarán todos sus mensajes, contactos y otros datos del dispositivo."</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Esta cuenta se requiere en algunas aplicaciones. Solo puedes eliminarla si restableces los valores predeterminados de fábrica de la tableta (esta acción borra todos tus datos personales). Para ello, accede a Configuración &gt; Hacer copia de seguridad y restablecer."</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Esta cuenta se requiere en algunas aplicaciones. Solo puedes eliminarla si restableces los valores predeterminados de fábrica de la tablet (esta acción borra todos tus datos personales). Para ello, accede a Configuración &gt; Hacer copia de seguridad y restablecer."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Algunas aplicaciones requieren esta cuenta. Solo puedes eliminarla si restableces el dispositivo a los valores predeterminados de fábrica (esta acción elimina todos tus datos personales). Para ello, accede a Configuración &gt; Hacer copia de seguridad y restablecer."</string>
     <string name="provider_label" msgid="7724593781904508866">"Suscripciones de inserción"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Mostrar vistas de ventanas procesadas con GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Ver actualiz. de capas de hardware"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Luz verde en capas de hardware al actualizarse"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Mostrar superposición GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"De mejor a peor: azul, verde, rojo claro, rojo"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Depurar superpos. con GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desactivar superpos. HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usar GPU para combinar pantallas"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Seguimientos de OpenGL"</string>
@@ -1737,7 +1736,7 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta función puede hacer que deje de funcionar una aplicación que tenga que utilizar datos en segundo plano cuando solo estén disponibles redes móviles."\n\n"Puedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Solo se pueden restringir los datos en segundo plano si estableciste un límite de datos móviles."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"¿Activar sinc. automática?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Cualquier cambio que sufran tus cuentas en la Web se copiará automáticamente en tu tableta."\n\n"Algunas cuentas también pueden copiar automáticamente en la Web los cambios que sufre tu tableta. Una cuenta de Google funciona de esta manera."\n\n"Para elegir qué tipo de información sincronizar dentro de cada cuenta, ve a Configuración &gt; Cuentas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Cualquier cambio que sufran tus cuentas en la Web se copiará automáticamente en tu tablet."\n\n"Algunas cuentas también pueden copiar automáticamente en la Web los cambios que sufre tu tablet. Una cuenta de Google funciona de esta manera."\n\n"Para elegir qué tipo de información sincronizar dentro de cada cuenta, ve a Configuración &gt; Cuentas."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Cualquier cambio que sufran tus cuentas en la Web se copiará automáticamente en tu dispositivo."\n\n"Algunas cuentas también pueden copiar automáticamente en la Web los cambios que sufre tu dispositivo. Una cuenta de Google funciona de esta manera."\n\n"Para elegir qué tipo de información sincronizar dentro de cada cuenta, ve a Configuración &gt; Cuentas."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"¿Desactivar sinc. automática?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Así ahorrarás datos y energía, pero tendrás que sincronizar cada cuenta manualmente para recopilar la información reciente. Por otro lado, no se te notificarán las actualizaciones."</string>
@@ -1747,11 +1746,11 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Configurar advertencia acerca del uso de datos"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Establecer el límite de uso de datos"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar el uso de datos"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado."\n\n"Debido a que el uso de datos medido por tu tableta puede diferir del cálculo de uso de tu proveedor, considera usar un límite prudente."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado."\n\n"Debido a que el uso de datos medido por tu tablet puede diferir del cálculo de uso de tu proveedor, considera usar un límite prudente."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado."\n\n"Debido a que el uso de datos medido por tu teléfono puede diferir del cálculo de uso de tu proveedor, considera usar un límite prudente."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir el uso de datos en segundo plano?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Si restringes los datos móviles en segundo plano, algunas aplicaciones y servicios no funcionarán a menos que te conectes a una red Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si restringes los datos móviles en segundo plano, algunos servicios y aplicaciones no funcionarán a menos que te conectes a una red Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de esta tableta."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si restringes los datos móviles en segundo plano, algunos servicios y aplicaciones no funcionarán a menos que te conectes a una red Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de esta tablet."</string>
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Si restringes los datos móviles en segundo plano, algunos servicios y aplicaciones no funcionarán a menos que te conectes a una red Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"advertencia"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"límite"</font></string>
@@ -1759,7 +1758,7 @@
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Aplicaciones y usuarios eliminados"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> recibidos, <xliff:g id="SENT">%2$s</xliff:g> enviados"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: se usaron unos <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
-    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: se usaron unos <xliff:g id="TOTAL">%1$s</xliff:g> según tu tableta. La medición de tu proveedor puede diferir."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: se usaron unos <xliff:g id="TOTAL">%1$s</xliff:g> según tu tablet. La medición de tu proveedor puede diferir."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: se usaron unos <xliff:g id="TOTAL">%1$s</xliff:g> según tu teléfono. La medición de tu proveedor puede diferir."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Zonas Wi-Fi móviles"</string>
     <string name="data_usage_metered_body" msgid="4959032833706695848">"Selecciona las redes Wi-Fi que sean zonas móviles. Se puede impedir que las aplicaciones usen estas redes cuando se ejecuten en segundo plano. Asimismo, las aplicaciones pueden mostrar una advertencia antes de usar estas redes para descargar archivos de gran tamaño."</string>
@@ -1826,50 +1825,48 @@
     <string name="user_list_title" msgid="7937158411137563543">"Usuarios y perfiles"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Agregar usuario o perfil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restringido"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Para poder crear un perfil restringido, debes configurar un bloqueo de pantalla que proteja tus aplicaciones y datos personales."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Configurar bloqueo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"No configurado"</string>
-    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Perfil restringido sin configurar"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Sin configurar - Perfil restringido"</string>
     <string name="user_owner" msgid="3879126011135546571">"Propietario"</string>
     <string name="user_you" msgid="1639158809315025986">"Tú (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Seudónimo"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Agregar"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Los usuarios tienen sus propias aplicaciones y contenidos."</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Los perfiles restringidos solo pueden acceder a las aplicaciones y al contenido desde tus cuentas."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Desde tu cuenta, puedes restringir el acceso a las aplicaciones y al contenido."</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuario"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restringido"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Agregar usuario nuevo"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Puedes crear usuarios adicionales para compartir este dispositivo con otras personas. Cada usuario cuenta con su propio espacio y puede personalizarlo con sus propios fondos de pantalla, aplicaciones, etc. Los usuarios también pueden cambiar ciertos parámetros de configuración de la tableta como, por ejemplo, la red Wi-Fi, que afectan a todos."\n\n"Luego de que crees un usuario nuevo, este tiene que pasar por un proceso de configuración."\n\n"Cualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Puedes crear usuarios adicionales para compartir este dispositivo con otras personas. Cada usuario cuenta con su propio espacio y puede personalizarlo con sus propios fondos de pantalla, aplicaciones, etc. Los usuarios también pueden cambiar ciertos parámetros de configuración de la tablet como, por ejemplo, la red Wi-Fi, que afectan a todos."\n\n"Luego de que crees un usuario nuevo, este tiene que pasar por un proceso de configuración."\n\n"Cualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Luego de que crees un usuario nuevo, este tiene que pasar por un proceso de configuración."\n\n"Cualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"¿Configurar el usuario ahora?"</string>
-    <string name="user_setup_dialog_message" msgid="614037943337008555">"Asegúrate de que la persona esté disponible para aceptar la tableta y configurar su espacio."</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Asegúrate de que la persona esté disponible para aceptar la tablet y configurar su espacio."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"¿Quieres configurar tu perfil ahora?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurar ahora"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ahora no"</string>
-    <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Solo los propietarios de la tableta pueden administrar los usuarios."</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Solo los propietarios de la tablet pueden administrar los usuarios."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Solo los propietarios del dispositivo pueden administrar los usuarios."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Los perfiles restringidos no pueden agregar cuentas."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eliminar <xliff:g id="USER_NAME">%1$s</xliff:g> del disp."</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Usuario nuevo"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Perfil nuevo"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"¿Deseas eliminarte a ti mismo?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"¿Eliminar usuario?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
-    <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Perderás tu espacio y tus datos en esta tableta. No puedes deshacer esta acción."</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"¿Eliminar perfil?"</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Perderás tu espacio y tus datos en esta tablet. No puedes deshacer esta acción."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Perderás tu espacio y tus datos en este dispositivo. No puedes deshacer esta acción."</string>
-    <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"El espacio y los datos de este usuario desaparecerán de esta tableta. No puedes deshacer esta acción."</string>
+    <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"El espacio y los datos de este usuario desaparecerán de esta tablet. No puedes deshacer esta acción."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"El espacio y los datos de este usuario desaparecerán de este dispositivo. No puedes deshacer esta acción."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"El espacio y los datos de este perfil desaparecerán de esta tablet. No puedes deshacer esta acción."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"El espacio y los datos de este perfil desaparecerán de este teléfono. No puedes deshacer esta acción."</string>
     <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="tablet" msgid="8045013389464294039">"Esta configuración afecta a todos los usuarios de esta tablet."</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>
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string>
@@ -1879,19 +1876,18 @@
     <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_restrictions_title" msgid="7745810037152772035">"Restricción de aplicación/contenido"</string>
     <string name="user_rename" msgid="8523499513614655279">"CAMBIAR NOMBRE"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Configurar límites de aplicaciones"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controladas por <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Esta aplicación no se admite para perfiles restringidos."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Esta aplicación puede acceder a tus cuentas."</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi y red de celulares"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Permitir modificar la configuración de la red Wi‑Fi y de la red de celulares"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Permitir modificar la sincronización y configuración de Bluetooth"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
-    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Permitir el intercambio de datos cuando la tableta toque otro dispositivo"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Permitir el intercambio de datos cuando la tablet toque otro dispositivo"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Permitir el intercambio de datos cuando el teléfono toque otro dispositivo"</string>
     <string name="restriction_location_enable_title" msgid="8134436816263688497">"Acceso a la ubicación"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Permitir que las aplicaciones usen la información de tu ubicación"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 98ec894..e0c6c69 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -128,7 +128,7 @@
     <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
-    <item msgid="5085064298144493867">"Botón push"</item>
+    <item msgid="5085064298144493867">"Botón WPS"</item>
     <item msgid="1624323946324499595">"PIN del otro dispositivo"</item>
     <item msgid="5366790421523328066">"PIN del dispositivo"</item>
   </string-array>
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Ubicación"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Mensajes"</item>
-    <item msgid="8971765125227378270">"Dispositivo"</item>
+    <item msgid="886742181977884584">"Multimedia"</item>
+    <item msgid="7924928667052300589">"Dispositivo"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ubicación común"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"reproducir audio"</item>
     <item msgid="8374996688066472414">"leer portapapeles"</item>
     <item msgid="3045529469061083747">"modificar portapapeles"</item>
+    <item msgid="5124443975763747838">"botones multimedia"</item>
+    <item msgid="4547883971364273343">"foco de audio"</item>
+    <item msgid="2603878814882344450">"volumen principal"</item>
+    <item msgid="7136963238377062018">"volumen de la voz"</item>
+    <item msgid="4270236897655923007">"volumen del tono"</item>
+    <item msgid="6325739889222559394">"volumen multimedia"</item>
+    <item msgid="5762123934816216821">"volumen de la alarma"</item>
+    <item msgid="785049718065337473">"volumen de las notificaciones"</item>
+    <item msgid="6700305533746877052">"volumen de Bluetooth"</item>
+    <item msgid="2029227495214047094">"mantener activo"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ubicación"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Reproducir audio"</item>
     <item msgid="136815868796597058">"Leer portapapeles"</item>
     <item msgid="5238692940326972503">"Modificar portapapeles"</item>
+    <item msgid="5753789168376302997">"Botones multimedia"</item>
+    <item msgid="3265262911688671938">"Foco de audio"</item>
+    <item msgid="2098976479485046797">"Volumen principal"</item>
+    <item msgid="5660213838861789350">"Volumen de la voz"</item>
+    <item msgid="7983336752371254444">"Volumen del tono"</item>
+    <item msgid="7878027809189330917">"Volumen multimedia"</item>
+    <item msgid="7260546305036218513">"Volumen de alarma"</item>
+    <item msgid="9103719301075748925">"Volumen de notificaciones"</item>
+    <item msgid="7025966722295861512">"Volumen de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mantener activo"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"En pantalla como líneas"</item>
     <item msgid="120512413928262547">"En adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"No"</item>
+    <item msgid="7688197031296835369">"Mostrar áreas sobredibujadas"</item>
+    <item msgid="8332661909019981149">"Mostrar contador de sobredibujos"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límite estándar"</item>
     <item msgid="4071574792028999443">"Sin procesos en segundo plano"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2f646a7..0566d34 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -93,8 +93,8 @@
     <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>
-    <string name="battery_info_status_discharging" msgid="310932812698268588">"No se está cargando."</string>
-    <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se está cargando."</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"No se está cargando"</string>
+    <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se está cargando"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Completa"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"No se está cargando"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Introduce el texto que se mostrará en la pantalla de bloqueo."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar información de usuario en la pantalla de bloqueo"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Información del usuario"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar información de perfil en pantalla bloqueo"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Información perfil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Acceso a tu ubicación"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
@@ -506,7 +508,7 @@
     <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"La pantalla inalámbrica está inhabilitada porque la red Wi-Fi está desactivada."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Buscar pantallas"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Buscando…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Sin pantallas inalámbricas cercanas"</string>
+    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"No hay 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>
@@ -550,7 +552,7 @@
     <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>
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Buscar redes siempre"</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>
+    <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>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mejorar la precisión de la ubicación y otros fines, Google y otras aplicaciones pueden buscar redes cercanas aunque la conexión Wi-Fi esté desactivada. Si no quieres que esto ocurra, accede a Ajustes avanzados &gt; Buscar redes siempre."</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 Ajustes avanzados &gt; Buscar redes siempre."</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar red"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para ver redes disponibles, activa el Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Buscando redes Wi-Fi…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"No tienes permiso para cambiar la red Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Otra red…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Más"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuración automática (WPS)"</string>
@@ -582,7 +583,7 @@
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Configuración WPS"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando configuración WPS…"</string>
     <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Pulsa el botón de configuración WPS del router. Es posible que ponga \"WPS\" o que incluya este símbolo:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Introduce el código PIN <xliff:g id="NUMBER">%1$s</xliff:g> en el router Wi‑Fi. El proceso de configuración puede tardar hasta dos minutos."</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Introduce el código <xliff:g id="NUMBER">%1$s</xliff:g> en el router Wi‑Fi. El proceso de configuración puede tardar hasta dos minutos."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"La configuración WPS se ha iniciado correctamente. Estableciendo conexión con la red…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Conectado a la red Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"El proceso de configuración de WPS está en curso y puede tardar hasta dos minutos."</string>
@@ -687,7 +688,7 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencio"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sonido de notificación predeterminado"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Luz de notificación"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Usar LED de notificación"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tono"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificación"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar volumen de llamada entrante para notificaciones"</string>
@@ -697,8 +698,8 @@
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarma"</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>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Sonar al tocar"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sonido en pantalla de bloqueo"</string>
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrar al tocar"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Supresión de ruido"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"Música, vídeos, juegos, y otros archivos multimedia"</string>
@@ -730,7 +731,7 @@
     <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>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"Pantalla giratoria"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Girar pantalla automáticamente"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Cambiar orientación al girar el tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Cambiar orientación automáticamente al girar el teléfono"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Cambiar orientación al girar el tablet"</string>
@@ -745,7 +746,7 @@
     <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 una base"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando el dispositivo esté conectado a 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>
@@ -978,7 +979,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Ubicación de red móvil y Wi‑Fi"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Ubicación por red móvil y Wi‑Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que las aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación más rápido. Se recopilarán datos de ubicación anónimos y se enviarán a Google"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicación determinada por Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satélites GPS"</string>
@@ -1039,7 +1040,7 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Patrón de desbloqueo"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Patrón obligatorio"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Debes crear un patrón para desbloquear la pantalla."</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Mostrar el patrón"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Mostrar el patrón dibujado"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrar al tocar"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloquear al encender"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Patrón de desbloqueo"</string>
@@ -1208,7 +1209,7 @@
     <string name="language_settings" msgid="5292716747264442359">"Idioma e introducción de texto"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma e introducción de texto"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Ajustes de idioma"</string>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado y métodos de entrada"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado y métodos de introducción"</string>
     <string name="phone_language" msgid="8870144109924299673">"Idioma"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Corrección automática"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para cambiar, pulsa Ctrl+espacio."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predeterminado"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Diseños de teclado"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario del usuario"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionario personal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Diccionarios personales"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Diccionario personal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Añadir"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Añadir al diccionario"</string>
@@ -1405,7 +1404,7 @@
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Datos recibidos"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
-    <string name="usage_type_on_time" msgid="3351200096173733159">"Tiempo de activación"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Tiempo encendida"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tiempo sin señal"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forzar detención"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Información de la aplicación"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tono"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta al tono del texto hablado."</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma no seleccionado"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Establecer la voz del idioma específico para el texto hablado"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Escuchar un ejemplo"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproducir una breve demostración de síntesis de voz"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Actualizar vistas de las ventanas creadas con GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Ver actualizaciones capas"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Iluminar capas de hardware en verde al actualizarse"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Mostrar superación de GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"De mejor a peor: azul, verde, rojo claro, rojo"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Depurar sobredibujos de GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Inhabilitar superposiciones HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usar siempre GPU para combinar pantallas"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Habilitar seguimiento OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Usuarios y perfiles"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Añadir usuario o perfil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil limitado"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Para poder crear un perfil restringido, debes configurar una pantalla de bloqueo que proteja tus aplicaciones y datos personales."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Establecer bloqueo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Sin configurar"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"No se ha configurado: perfil limitado"</string>
     <string name="user_owner" msgid="3879126011135546571">"Propietario"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Apodo"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Añadir"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Los usuarios tienen contenido y aplicaciones propios"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Los perfiles limitados solo pueden acceder a las aplicaciones y al contenido de tus cuentas"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Desde tu cuenta, puedes restringir el acceso a las aplicaciones y al contenido"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuario"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil limitado"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Añadir nuevo usuario"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ahora no"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Solo el propietario del tablet puede administrar los usuarios."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Solo el propietario del teléfono puede administrar los usuarios."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Los perfiles restringidos no pueden añadir cuentas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eliminar a <xliff:g id="USER_NAME">%1$s</xliff:g> de este dispositivo"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nuevo usuario"</string>
-    <string name="user_new_profile_name" msgid="2632088404952119900">"Nuevo perfil"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Perfil nuevo"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"¿Eliminarte a ti mismo?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"¿Eliminar usuario?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"¿Eliminar el perfil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Perderás tu espacio y tus datos en este tablet. Esta acción no se puede deshacer."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Perderás tu espacio y tus datos en este teléfono. Esta acción no se puede deshacer."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Los datos y el espacio de este usuario se eliminarán de este tablet. Esta acción no se puede deshacer."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Los datos y el espacio de este usuario se eliminarán de este teléfono. Esta acción no se puede deshacer."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Los datos y el espacio de este perfil se eliminarán de este tablet. Esta acción no se puede deshacer."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Los datos y el espacio de este perfil se eliminarán de este teléfono. Esta acción no se puede deshacer."</string>
     <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>
@@ -1877,14 +1874,13 @@
     <string name="help_label" msgid="1107174367904110532">"Ayuda"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Cuenta para contenido"</string>
     <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="cell_broadcast_settings" msgid="8415582011920085222">"Mensajes de radiodifusión"</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="7745810037152772035">"Restricciones contenido/aplicaciones"</string>
     <string name="user_rename" msgid="8523499513614655279">"CAMBIAR NOMBRE"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Establecer límites de aplicación"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controladas por <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Esta aplicación no se puede utilizar en perfiles restringidos"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Esta aplicación puede acceder a tus cuentas"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi y redes móviles"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Permitir modificar los ajustes de Wi‑Fi y redes móviles"</string>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index e72eb1d..875fecf 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Asukoht"</item>
     <item msgid="255608127647030286">"Isiklik"</item>
     <item msgid="4588829735729884491">"Sõnumside"</item>
-    <item msgid="8971765125227378270">"Seade"</item>
+    <item msgid="886742181977884584">"Meedia"</item>
+    <item msgid="7924928667052300589">"Seade"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"üldine asukoht"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"heli esitamine"</item>
     <item msgid="8374996688066472414">"lõikelaua lugemine"</item>
     <item msgid="3045529469061083747">"lõikelaua muutmine"</item>
+    <item msgid="5124443975763747838">"meedianupud"</item>
+    <item msgid="4547883971364273343">"helifookus"</item>
+    <item msgid="2603878814882344450">"põhihelitugevus"</item>
+    <item msgid="7136963238377062018">"hääle helitugevus"</item>
+    <item msgid="4270236897655923007">"helina helitugevus"</item>
+    <item msgid="6325739889222559394">"meedia helitugevus"</item>
+    <item msgid="5762123934816216821">"äratuse helitugevus"</item>
+    <item msgid="785049718065337473">"märguande helitugevus"</item>
+    <item msgid="6700305533746877052">"Bluetoothi helitugevus"</item>
+    <item msgid="2029227495214047094">"hoia ärkvel"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Asukoht"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Heli esitamine"</item>
     <item msgid="136815868796597058">"Lõikelaua lugemine"</item>
     <item msgid="5238692940326972503">"Lõikelaua muutmine"</item>
+    <item msgid="5753789168376302997">"Meedianupud"</item>
+    <item msgid="3265262911688671938">"Helifookus"</item>
+    <item msgid="2098976479485046797">"Põhihelitugevus"</item>
+    <item msgid="5660213838861789350">"Hääle helitugevus"</item>
+    <item msgid="7983336752371254444">"Helina helitugevus"</item>
+    <item msgid="7878027809189330917">"Meedia helitugevus"</item>
+    <item msgid="7260546305036218513">"Alarmi helitugevus"</item>
+    <item msgid="9103719301075748925">"Märguande helitugevus"</item>
+    <item msgid="7025966722295861512">"Bluetoothi helitugevus"</item>
+    <item msgid="4665183401128289653">"Hoia ärkvel"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lühike"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Ekraanil joontena"</item>
     <item msgid="120512413928262547">"Adb-kestas dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Väljas"</item>
+    <item msgid="7688197031296835369">"Kuva ülejoonistatud alad"</item>
+    <item msgid="8332661909019981149">"Kuva ülejoonistuse loendur"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardpiir"</item>
     <item msgid="4071574792028999443">"Taustaprotsessideta"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 0eaba84..4a6b687 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Sisestage lukustusekraanil kuvatav tekst"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Kuva lukustusekraanil teave kasutaja kohta"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Kasutajateave"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Kuva lukustusekraanil profiili teave"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiili teave"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Juurdepääs asukohale"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Turvalisus"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Määrake Minu asukoht, ekraani avamine, SIM-kaardi lukk, mandaadi talletuslukk"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Võrgu muutmine"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Saadavate võrkude kuvamiseks lülitage WiFi sisse."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"WiFi-võrkude otsimine ..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Teil pole WiFi-võrgu muutmiseks luba."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Muu võrk ..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Rohkem"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaatseadistus (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Vahetamiseks vajutage Ctrl+tühikut"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Vaikepaigutus"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Klaviatuuri paigutused"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kasutajasõnastik"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Isiklik sõnastik"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Isiklikud sõnastikud"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Isiklik sõnaraamat"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lisa"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lisa sõnastikku"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Helikõrgus"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mõjutab räägitava teksti tooni"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Keel"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Keelt pole valitud"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Määrab räägitud teksti keelespetsiifilise hääle"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Kuulake näidet"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Esita lühike kõnesünteesi demo"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU-ga joonistades kirjuta akende kuvad üle"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Kuva riistv. kiht. värsk."</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Riistvara kihid vilguvad värskendamisel roheliselt"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Kuva GPU ülejoonistamine"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Parimast halvimani: sin., roh., helepunane, punane"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Silu GPU ülejoonistust"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Keela HW ülekatted"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Kasuta alati GPU-d kuva koostamisel"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Luba OpenGL-i jälgimine"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Kasutajad ja profiilid"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Lisa kasutaja või profiil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Piiratud profiil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Enne piiratud profiili loomist peate seadistama lukustusekraani, et oma rakendusi ja isiklikke andmeid kaitsta."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Määra lukk"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Pole seadistatud"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Pole seadistatud – piiratud profiil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Omanik"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Hüüdnimi"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Lisamine"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Kasutajatel on oma rakendused ja sisu"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Piiratud profiilid pääsevad teie kontodelt juurde vaid rakendustele ja sisule"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Juurdepääsu rakendustele ja sisule saate piirata oma kontol"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Kasutaja"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Piiratud profiil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Uue kasutaja lisamine"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Mitte praegu"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Ainult tahvelarvuti omanik saab hallata kasutajaid."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Ainult telefoni omanik saab hallata kasutajaid."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Piiratud profiilid ei saa kontosid lisada"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Kustuta seadmest <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Uus kasutaja"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Uus profiil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Kas soovite kustutada iseenda?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Kas eemaldada kasutaja?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Kas eemaldada profiil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Kaotate selles tahvelarvutis olevad ruumi ja andmed. Seda toimingut ei saa tagasi võtta."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Kaotate selles telefonis olevad ruumi ja andmed. Seda toimingut ei saa tagasi võtta."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Kasutaja ruum ja andmed kaovad tahvelarvutist. Seda toimingut ei saa tagasi võtta."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Kasutaja ruum ja andmed kaovad telefonist. Seda toimingut ei saa tagasi võtta."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Selle profiili ruum ja andmed kaovad tahvelarvutist. Seda toimingut ei saa tagasi võtta."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Selle profiili ruum ja andmed kaovad telefonist. Seda toimingut ei saa tagasi võtta."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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>
-    <string name="user_restrictions_title" msgid="371835484894400390">"Rakenduste ja sisu lubamine"</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Rakenduse ja sisu piirangud"</string>
     <string name="user_rename" msgid="8523499513614655279">"NIMETA ÜMBER"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Määra rakenduse piirangud"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Juhib: <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Seda rakendust ei toetata piiratud profiilides"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"See rakendus pääseb teie kontode juurde"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"WiFi ja mobiilne andmeside"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"WiFi ja mobiilse andmeside seadete muutmise lubamine"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 97ba48c..0a34c51 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"مکان"</item>
     <item msgid="255608127647030286">"شخصی"</item>
     <item msgid="4588829735729884491">"پیام‌رسانی"</item>
-    <item msgid="8971765125227378270">"دستگاه"</item>
+    <item msgid="886742181977884584">"رسانه"</item>
+    <item msgid="7924928667052300589">"دستگاه"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"موقعیت مکانی غیردقیق"</item>
@@ -246,7 +247,7 @@
     <item msgid="6546959730920410907">"اصلاح گزارش تماس"</item>
     <item msgid="446877710771379667">"خواندن تقویم"</item>
     <item msgid="7674458294386319722">"اصلاح تقویم"</item>
-    <item msgid="8281201165558093009">"جستجوی شبکه wi-fi"</item>
+    <item msgid="8281201165558093009">"جستجوی شبکه Wi‑Fi"</item>
     <item msgid="8694611243479480497">"اعلان"</item>
     <item msgid="7776439107987345446">"جستجوی شبکه سلولی"</item>
     <item msgid="514615766544675057">"تماس تلفنی"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"پخش صدا"</item>
     <item msgid="8374996688066472414">"خواندن کلیپ بورد"</item>
     <item msgid="3045529469061083747">"اصلاح کلیپ‌بورد"</item>
+    <item msgid="5124443975763747838">"دکمه‌های رسانه‌ای"</item>
+    <item msgid="4547883971364273343">"فوکوس صدا"</item>
+    <item msgid="2603878814882344450">"میزان کنترل"</item>
+    <item msgid="7136963238377062018">"میزان صدا"</item>
+    <item msgid="4270236897655923007">"حجم حلقه"</item>
+    <item msgid="6325739889222559394">"میزان صدای رسانه"</item>
+    <item msgid="5762123934816216821">"میزان صدای زنگ هشدار"</item>
+    <item msgid="785049718065337473">"میزان صدای اعلان"</item>
+    <item msgid="6700305533746877052">"میزان صدای بلوتوث"</item>
+    <item msgid="2029227495214047094">"بیدار باش"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"موقعیت مکانی"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"پخش صدا"</item>
     <item msgid="136815868796597058">"خواندن کلیپ بورد"</item>
     <item msgid="5238692940326972503">"اصلاح کردن کلیپ بورد"</item>
+    <item msgid="5753789168376302997">"دکمه‌های رسانه‌"</item>
+    <item msgid="3265262911688671938">"فوکوس صدا"</item>
+    <item msgid="2098976479485046797">"میزان صدای اصلی"</item>
+    <item msgid="5660213838861789350">"میزان صدای مکالمه"</item>
+    <item msgid="7983336752371254444">"میزان صدای زنگ"</item>
+    <item msgid="7878027809189330917">"میزان صدای رسانه"</item>
+    <item msgid="7260546305036218513">"میزان صدای زنگ هشدار"</item>
+    <item msgid="9103719301075748925">"میزان صدای اعلان"</item>
+    <item msgid="7025966722295861512">"میزان صدای بلوتوث"</item>
+    <item msgid="4665183401128289653">"بیدار باش"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"کوتاه"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"بر روی صفحه نمایش بصورت خط"</item>
     <item msgid="120512413928262547">"در adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"غیرفعال"</item>
+    <item msgid="7688197031296835369">"نمایش نواحی بازنویسی"</item>
+    <item msgid="8332661909019981149">"نمایش شمارشگر میزان بازنویسی"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"حد استاندارد"</item>
     <item msgid="4071574792028999443">"بدون پردازش در پس‌زمینه"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 47c9ff4..69aa011 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"متنی را وارد کنید تا در صفحه قفل شده نشان داده شود"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"نمایش اطلاعات کاربر بر روی صفحه قفل"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"اطلاعات کاربر"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"نمایش اطلاعات نمایه در صفحه قفل"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"اطلاعات نمایه"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"دسترسی به موقعیت مکانی"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"امنیت"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل محل ذخیره اطلاعات کاربری"</string>
@@ -533,7 +535,7 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"در صورت روشن بودن این ویژگی، می‌توانید با نگهداشتن دستگاه‌ها نزدیک به یکدیگر، محتوای برنامهٔ کاربردی را به دستگاه دارای قابلیت NFC دیگری مخابره کنید. به‌عنوان مثال، می‌توانید صفحات مرورگر، ویدئوهای YouTube، تماس‌های افراد و موارد دیگر را مخابره کنید."\n\n" کافیست دستگاه‌ها را نزدیک هم بگذارید (معمولاً پشت به پشت) و سپس صفحهٔ نمایش خود را لمس کنید. برنامه‌ کاربردی آنچه را مخابره می‌شود تعیین می‌کند."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"کاوش سرویس شبکه"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"به برنامه‎های دستگاه‌های دیگر اجازه داده شود برنامه‎های این دستگاه را ببینند"</string>
-    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"روشن کردن Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"تنظیمات Wi-Fi"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"اصلاح کردن شبکه"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"برای مشاهده شبکه‌های در دسترس، Wi-Fi را روشن کنید."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"در حال جستجوی شبکه‌های Wi-Fi…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"‫اجازه ندارید شبکه Wi‑Fi را تغییر دهید."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"شبکه‌ای دیگر…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"بیشتر"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"تنظیم خودکار (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"برای تغییر، Control-کلید فاصله را فشار هید"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"پیش‌فرض"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"طرح‌بندی‌های صفحه‌کلید"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"فرهنگ لغت کاربر"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"فرهنگ لغت شخصی"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"فرهنگ‌های لغت شخصی"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"فرهنگ لغت شخصی"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"افزودن"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"افزودن به فرهنگ لغت"</string>
@@ -1355,8 +1354,7 @@
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> باید:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"عملکردهای خود را مشاهده کنید"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"دریافت اعلان وقتی در حال تعامل با برنامه‌ای هستید."</string>
-    <!-- no translation found for disable_service_title (3624005212728512896) -->
-    <skip />
+    <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> متوقف شود؟"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"با لمس کردن تأیید، <xliff:g id="SERVICE">%1$s</xliff:g> متوقف خواهد شد."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"سرویسی نصب نشده است"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"به صفحه‌خوان نیاز دارید؟"</string>
@@ -1457,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"زیر و بمی صدا"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"بر صدای متن گفته شده تأثیر می‌گذارد"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"زبان"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"زبان انتخاب نشده است"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"صدای خاص یک زبان را برای متن گفتاری تنظیم می‌کند"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"به نمونه‌ای گوش کنید"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"نمایش کوتاهی از صدای ترکیبی پخش شود"</string>
@@ -1673,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"هنگام طراحی با GPU٬ نماها در داخل پنجره‌ها فلش شوند"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"نمایش به‌روزرسانی‌های لایه‌های سخت‌افزار"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"وقتی لایه‌های سخت‌افزاری به‌روزرسانی‌ می‌شوند، به رنگ سبز درآیند"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"نمایش بازنویسی GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"از بهترین تا بدترین: آبی، سبز، قرمز روشن، قرمز"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"اشکال‌زدایی بازنویسی GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"غیر فعال کردن پوشش HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"همیشه از GPU در ترکیب صفحه استفاده شود"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"فعال کردن ردیابی‌های OpenGL"</string>
@@ -1826,15 +1824,17 @@
     <string name="user_settings_title" msgid="6151874007858148344">"کاربران"</string>
     <string name="user_list_title" msgid="7937158411137563543">"کاربران و نمایه‌ها"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"افزودن کاربر یا نمایه"</string>
-    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"نمایه محدود شده"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"نمایهٔ محدودشده"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"قبل از ایجاد یک نمایه محدود، باید یک قفل صفحه را برای محافظت از برنامه‌ها و داده‌های شخصی خود تنظیم کنید."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"تنظیم قفل"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"تنظیم نشده"</string>
-    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"تنظیم نشده است - نمایه محدود شده"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"تنظیم نشده است - نمایهٔ محدودشده"</string>
     <string name="user_owner" msgid="3879126011135546571">"مالک"</string>
     <string name="user_you" msgid="1639158809315025986">"شما (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"نام مستعار"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"افزودن"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"کاربران دارای برنامه‌ها و محتوای متعلق به خود هستند"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"نمایه‌های محدود شده تنها می‌توانند به برنامه‌ها و محتوای حساب‌های شما دسترسی یابند"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"می‌توانید از حساب خود دسترسی به برنامه‌ها و محتوا را محدود کنید"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"کاربر"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"نمایه محدود شده"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"اضافه کردن کاربر جدید"</string>
@@ -1847,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"اکنون خیر"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"فقط صاحب رایانه لوحی می‌تواند کاربران را مدیریت کند."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"فقط صاحب گوشی می‌تواند کاربران را مدیریت کند."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"نمایه‌های محدود نمی‌توانند حسابی را اضافه کنند"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"حذف <xliff:g id="USER_NAME">%1$s</xliff:g> از این دستگاه"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"کاربر جدید"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"نمایه جدید"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"حذف خودتان؟"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"حذف کاربر؟"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"نمایه حذف شود؟"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"داده‌ها و فضای خود را در این رایانه لوحی از دست می‌دهید. شما نمی‌توانید این عملکرد را لغو کنید."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"داده‌ها و فضای خود را در این تلفن از دست می‌دهید. شما نمی‌توانید این عملکرد را لغو کنید."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"این داده‌ها و فضای کاربر از این رایانه لوحی پاک می‌شود. شما نمی‌توانید این عملکرد را لغو کنید."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"این داده‌ها و فضای کاربر از این تلفن پاک می‌شود. شما نمی‌توانید این عملکرد را لغو کنید."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"داده‌ها و فضای این نمایه از این رایانه لوحی پاک می‌شوند. واگرد این عملکرد ممکن نیست."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"داده‌ها و فضای این نمایه در این گوشی پاک می‌شوند. واگرد این عملکرد ممکن نیست."</string>
     <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>
@@ -1880,14 +1876,12 @@
     <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_restrictions_title" msgid="7745810037152772035">"محدودیت‌های محتوا و برنامه"</string>
     <string name="user_rename" msgid="8523499513614655279">"تغییر نام"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"تنظیم محدودیت‌های برنامه"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"کنترل شده توسط <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
-    <!-- no translation found for app_sees_restricted_accounts (7503264525057246240) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"این برنامه در نمایه‌های محدود پشتیبانی نمی‌شود"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"این برنامه می‌تواند به حساب‌های شما دسترسی یابد"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi و تلفن همراه"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"اجازه برای اعمال تغییرات در تنظیمات Wi‑Fi و تلفن همراه"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"بلوتوث"</string>
@@ -1900,7 +1894,7 @@
     <string name="wizard_back" msgid="5567007959434765743">"بازگشت"</string>
     <string name="wizard_next" msgid="3606212602795100640">"بعدی"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"پایان"</string>
-    <string name="user_image_take_photo" msgid="1280274310152803669">"عکسبرداری"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"عکس گرفتن"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"انتخاب عکس از گالری"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index a07a248..f88bc26 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Sijainti"</item>
     <item msgid="255608127647030286">"Henkilökohtaiset"</item>
     <item msgid="4588829735729884491">"Viestit"</item>
-    <item msgid="8971765125227378270">"Laite"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Laite"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"karkea sijainti"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"toista ääntä"</item>
     <item msgid="8374996688066472414">"lue leikepöytä"</item>
     <item msgid="3045529469061083747">"muokkaa leikepöytää"</item>
+    <item msgid="5124443975763747838">"mediapainikkeet"</item>
+    <item msgid="4547883971364273343">"äänen painopiste"</item>
+    <item msgid="2603878814882344450">"pää-äänenvoimakkuus"</item>
+    <item msgid="7136963238377062018">"puheäänen voimakkuus"</item>
+    <item msgid="4270236897655923007">"soittoäänen voimakkuus"</item>
+    <item msgid="6325739889222559394">"median äänenvoimakkuus"</item>
+    <item msgid="5762123934816216821">"hälytyksen äänenvoimakkuus"</item>
+    <item msgid="785049718065337473">"ilmoituksen äänenvoimakkuus"</item>
+    <item msgid="6700305533746877052">"bluetooth-äänenvoimakkuus"</item>
+    <item msgid="2029227495214047094">"ei virransäästötilaa"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Sijainti"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Toista ääntä"</item>
     <item msgid="136815868796597058">"Lue leikepöytä"</item>
     <item msgid="5238692940326972503">"Muokkaa leikepöytää"</item>
+    <item msgid="5753789168376302997">"Mediapainikkeet"</item>
+    <item msgid="3265262911688671938">"Äänen painopiste"</item>
+    <item msgid="2098976479485046797">"Pää-äänenvoimakkuus"</item>
+    <item msgid="5660213838861789350">"Puheäänen voimakkuus"</item>
+    <item msgid="7983336752371254444">"Soittoäänen voimakkuus"</item>
+    <item msgid="7878027809189330917">"Median äänenvoimakkuus"</item>
+    <item msgid="7260546305036218513">"Hälytyksen voimakkuus"</item>
+    <item msgid="9103719301075748925">"Ilmoituksen äänenvoimakkuus"</item>
+    <item msgid="7025966722295861512">"Bluetooth-äänenvoimakkuus"</item>
+    <item msgid="4665183401128289653">"Ei virransäästötilaa"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lyhyt"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Ruudulla viivoina"</item>
     <item msgid="120512413928262547">"Adb shell dumpsys gfxinfossa"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Ei käytössä"</item>
+    <item msgid="7688197031296835369">"Näytä päällekkäiset alueet"</item>
+    <item msgid="8332661909019981149">"Näytä päällekkäisyyslaskuri"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Vakioraja"</item>
     <item msgid="4071574792028999443">"Ei taustaprosesseja"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index fefd6cd..51d9ad4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Kirjoita tekstiä näytettäväksi lukitusruudulla."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Näytä käyttäjän tiedot lukitusruudulla"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Käyttäjätiedot"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Näytä profiilin tiedot lukitusruudulla"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiilin tiedot"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Sijainnin käyttöoikeus"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Suojaus"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Muokkaa verkkoa"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Näet käyt. olevat verkot, kun otat wifin käyttöön."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Haetaan wifi-verkkoja…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Käyttöoikeutesi eivät riitä wifi-verkon muuttamiseen."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Muu verkko..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lisää"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaattiset aset. (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Vaihda painamalla Ctrl+välilyönti"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Oletus"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Näppäimistöasettelut"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Käyttäjän sanakirja"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Oma sanakirja"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Omat sanakirjat"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Oma sanakirja"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lisää"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lisää sanakirjaan"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Äänenkorkeus"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Vaikuttaa puhutun tekstin äänenkorkeuteen"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Kieli"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Kieltä ei ole valittu"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Asettaa puhutulle tekstille kielikohtaisen äänen"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Kuuntele esimerkki"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Toista lyhyt esittely puhesynteesistä"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Väläytä ikkunoiden sisältö GPU:lla piirrettäessä"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Näytä laitt.tason päiv."</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Näytä laitteistotasot vihreinä niiden päivittyessä"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Näytä GPU-ylitys"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Paras -&gt; huonoin: sin., vihr., vaal.pun., pun."</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU-objektien päällekkäisyys"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Poista HW-peittok. käyt."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Käytä GPU:ta ruudun koostamiseen"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ota OpenGL-jälj. käyttöön"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Käyttäjät ja profiilit"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Lisää käyttäjä tai profiili"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Rajoitettu profiili"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Ennen kuin voit luoda rajoitetun profiilin, määritä ruudun lukitus, joka suojelee sovelluksiasi ja henkilökohtaisia tietojasi."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Aseta lukitus"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ei määritetty"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Asetuksia ei ole määritetty – rajoitettu profiili"</string>
     <string name="user_owner" msgid="3879126011135546571">"Omistaja"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Lempinimi"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Lisää"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Tavallisilla käyttäjillä on omia sovelluksia ja sisältöä."</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Rajoitetut profiilit voivat käyttää vain tiliesi sovelluksia ja sisältöä."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Voit rajoittaa tilisi sovelluksien ja sisällön käyttöä"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Käyttäjä"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Rajoitettu profiili"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Lisää uusi käyttäjä"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ei nyt"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Vain tablet-laitteen omistaja voi hallita käyttäjiä."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Vain puhelimen omistaja voi hallita käyttäjiä."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Rajoitetut profiilit eivät voi lisätä tilejä"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Poista <xliff:g id="USER_NAME">%1$s</xliff:g> laitteesta"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Uusi käyttäjä"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Uusi profiili"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Haluatko poistaa itsesi?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Poistetaanko käyttäjä?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Poistetaanko profiili?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Tilasi ja tietosi poistetaan tästä tablet-laitteesta. Tätä toimintoa ei voi peruuttaa."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Tilasi ja tietosi poistetaan tästä puhelimesta. Tätä toimintoa ei voi peruuttaa."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Tämän käyttäjän tila ja tiedot poistetaan tästä tablet-laitteesta. Toimintoa ei voi peruuttaa."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Tämän käyttäjän tila ja tiedot poistetaan tästä puhelimesta. Toimintoa ei voi peruuttaa."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Tämän profiilin tila ja tiedot poistetaan tästä tablet-laitteesta. Toimintoa ei voi peruuttaa."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Tämän profiilin tila ja tiedot poistetaan tästä puhelimesta. Toimintoa ei voi peruuttaa."</string>
     <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>
@@ -1879,13 +1876,12 @@
     <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>
-    <string name="user_restrictions_title" msgid="371835484894400390">"Sovellusten ja sisällön salliminen"</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Sovelluksien ja sisällön rajoituks."</string>
     <string name="user_rename" msgid="8523499513614655279">"NIMEÄ UUDELLEEN"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Aseta sovelluksen rajoitukset"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Ohjaaja: <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
-    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Tämä sovellus saa käyttää tilejäsi."</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Tätä sovellusta ei tueta rajoitetuissa profiileissa"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Tämä sovellus saa käyttää tilejäsi"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wifi- ja mobiiliverkko"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Salli wifi- ja mobiiliverkkoasetuksien muokkaaminen"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index b044807..e2cfc70 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Position"</item>
     <item msgid="255608127647030286">"Personnel"</item>
     <item msgid="4588829735729884491">"SMS/MMS"</item>
-    <item msgid="8971765125227378270">"Appareil"</item>
+    <item msgid="886742181977884584">"Multimédia"</item>
+    <item msgid="7924928667052300589">"Appareil"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"position approximative"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"lire le fichier audio"</item>
     <item msgid="8374996688066472414">"lire le Presse-papiers"</item>
     <item msgid="3045529469061083747">"modifier le Presse-papiers"</item>
+    <item msgid="5124443975763747838">"boutons pour contenus multimédias"</item>
+    <item msgid="4547883971364273343">"priorité audio"</item>
+    <item msgid="2603878814882344450">"volume général"</item>
+    <item msgid="7136963238377062018">"volume de la voix"</item>
+    <item msgid="4270236897655923007">"volume des sonneries"</item>
+    <item msgid="6325739889222559394">"volume des contenus multimédias"</item>
+    <item msgid="5762123934816216821">"volume des alarmes"</item>
+    <item msgid="785049718065337473">"volume des notifications"</item>
+    <item msgid="6700305533746877052">"volume Bluetooth"</item>
+    <item msgid="2029227495214047094">"maintenir activé"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Position"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Lire le fichier audio"</item>
     <item msgid="136815868796597058">"Lire le Presse-papiers"</item>
     <item msgid="5238692940326972503">"Modifier le Presse-papiers"</item>
+    <item msgid="5753789168376302997">"Boutons multimédias"</item>
+    <item msgid="3265262911688671938">"Priorité audio"</item>
+    <item msgid="2098976479485046797">"Volume général"</item>
+    <item msgid="5660213838861789350">"Volume de la voix"</item>
+    <item msgid="7983336752371254444">"Volume de la sonnerie"</item>
+    <item msgid="7878027809189330917">"Volume des contenus multimédias"</item>
+    <item msgid="7260546305036218513">"Volume de l\'alarme"</item>
+    <item msgid="9103719301075748925">"Volume des notifications"</item>
+    <item msgid="7025966722295861512">"Volume Bluetooth"</item>
+    <item msgid="4665183401128289653">"Maintenir activé"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Court"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"À l\'écran sous forme de lignes"</item>
     <item msgid="120512413928262547">"Dans adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Désactivé"</item>
+    <item msgid="7688197031296835369">"Afficher les zones de conflit"</item>
+    <item msgid="8332661909019981149">"Afficher le compteur des conflits"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite standard"</item>
     <item msgid="4071574792028999443">"Aucun processus en arrière-plan"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c5ca342..47e4392 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Saisir texte à afficher sur écran de verrouillage"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Afficher infos utilisateur sur écran verrouillage"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Infos utilisateur"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Afficher infos de profil sur écran de verrouillage"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Infos de profil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Données de localisation"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sécurité"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifier le réseau"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Activez le Wi-Fi pour voir les réseaux disponibles."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Recherche de réseaux Wi-Fi en cours…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Vous n\'avez pas l\'autorisation de modifier le réseau Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Autre réseau…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Plus"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuration auto (WPS)"</string>
@@ -978,7 +979,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Réseaux mobiles"</string>
     <string name="location_title" msgid="1029961368397484576">"Ma position"</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Localis. via Wi-Fi et réseau mob."</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Localis. via Wi-Fi et réseaux mobiles"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Autoriser applis à utiliser localisation Google pour estimer position plus rapidement. Infos localisation anonymes envoyées à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Position déterminée par le Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satellites GPS"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Appuyez sur Ctrl+Espace pour changer disposition"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Par défaut"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Dispositions du clavier"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dictionnaire personnel"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dictionnaire personnel"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dictionnaires personnels"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dictionnaire personnel"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Ajouter"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Ajouter au dictionnaire"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affecte le ton utilisé par la synthèse vocale"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Langue"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Langue non sélectionnée"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Définir la langue utilisée par la synthèse vocale"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Écouter un échantillon"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Lire une courte démonstration de la synthèse vocale"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Faire clignoter les éléments dessinés avec le GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Mises à jour couches mat."</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Couches matérielles en vert une fois mises à jour"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Afficher dépassements GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Du mieux au pire : bleu, vert, rouge clair, rouge"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Déboguer les conflits GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Désact. superpos. matér."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Toujours utiliser le GPU pour la composition écran"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activer les traces OpenGL"</string>
@@ -1828,6 +1827,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Utilisateurs et profils"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Ajouter un utilisateur ou un profil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil limité"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Avant de créer un profil limité, vous devez définir un écran de verrouillage pour protéger vos applications et vos données personnelles."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Définir verrouillage écran"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Non configuré"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Non configuré : profil limité"</string>
     <string name="user_owner" msgid="3879126011135546571">"Propriétaire"</string>
@@ -1835,7 +1836,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Pseudonyme"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Ajouter"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Les utilisateurs disposent de leurs propres applications et de leur propre contenu."</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Les profils limités ne peuvent accéder aux applications et au contenu que depuis vos comptes."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Vous pouvez limiter l\'accès aux applications et au contenu de votre compte."</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilisateur"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil limité"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Ajouter un utilisateur"</string>
@@ -1848,23 +1849,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Pas maintenant"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Seul le propriétaire du téléphone peut gérer les utilisateurs."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Les profils limités ne peuvent pas ajouter de compte."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Supp. <xliff:g id="USER_NAME">%1$s</xliff:g> de l\'appareil"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nouvel utilisateur"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nouveau profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vous supprimer ?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Supprimer l\'utilisateur ?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Supprimer le profil ?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Votre espace et vos données vont être supprimés de cette tablette. Cette action est irréversible."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Votre espace et vos données vont être supprimés de ce téléphone. Cette action est irréversible."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"L\'espace et les données de cet utilisateur vont être supprimés de cette tablette. Cette action est irréversible."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"L\'espace et les données de cet utilisateur vont être supprimés de ce téléphone. Cette action est irréversible."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"L\'espace et les données de ce profil vont être supprimés de cette tablette. Cette action est irréversible."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"L\'espace et les données de ce profil vont être supprimés de ce téléphone. Cette action est irréversible."</string>
     <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>
@@ -1881,12 +1878,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Limitations accès applis et contenu"</string>
     <string name="user_rename" msgid="8523499513614655279">"RENOMMER"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Définir restrictions des applications"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Contrôlées par <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Cette application n\'accepte pas les profils limités."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Cette application peut accéder à vos comptes."</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi et données mobiles"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Autoriser les modifications des paramètres du Wi‑Fi et des données mobiles"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 6ae78a9..069e9bc 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"स्थान"</item>
     <item msgid="255608127647030286">"व्यक्तिगत"</item>
     <item msgid="4588829735729884491">"संदेश सेवा"</item>
-    <item msgid="8971765125227378270">"उपकरण"</item>
+    <item msgid="886742181977884584">"मीडिया"</item>
+    <item msgid="7924928667052300589">"उपकरण"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"अस्पष्ट स्थान"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"ऑडियो चलाएं"</item>
     <item msgid="8374996688066472414">"क्लिपबोर्ड पढ़ें"</item>
     <item msgid="3045529469061083747">"क्लिपबोर्ड बदलें"</item>
+    <item msgid="5124443975763747838">"मीडिया बटन"</item>
+    <item msgid="4547883971364273343">"ऑडियो फ़ोकस"</item>
+    <item msgid="2603878814882344450">"मास्टर वॉल्यूम"</item>
+    <item msgid="7136963238377062018">"ध्वनि वॉल्यूम"</item>
+    <item msgid="4270236897655923007">"रिंग वॉल्यूम"</item>
+    <item msgid="6325739889222559394">"मीडिया वॉल्‍यूम"</item>
+    <item msgid="5762123934816216821">"अलार्म वॉल्यूम"</item>
+    <item msgid="785049718065337473">"सूचना वॉल्‍यूम"</item>
+    <item msgid="6700305533746877052">"bluetooth वॉल्यूम"</item>
+    <item msgid="2029227495214047094">"सचेत रखें"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"स्थान"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"ऑडियो चलाएं"</item>
     <item msgid="136815868796597058">"क्लिपबोर्ड पढ़ें"</item>
     <item msgid="5238692940326972503">"क्लिपबोर्ड बदलें"</item>
+    <item msgid="5753789168376302997">"मीडिया बटन"</item>
+    <item msgid="3265262911688671938">"ऑडियो फ़ोकस"</item>
+    <item msgid="2098976479485046797">"मास्टर वॉल्यूम"</item>
+    <item msgid="5660213838861789350">"ध्वनि वॉल्यूम"</item>
+    <item msgid="7983336752371254444">"रिंग वॉल्यूम"</item>
+    <item msgid="7878027809189330917">"मीडिया वॉल्‍यूम"</item>
+    <item msgid="7260546305036218513">"अलार्म वॉल्यूम"</item>
+    <item msgid="9103719301075748925">"सूचना वॉल्‍यूम"</item>
+    <item msgid="7025966722295861512">"Bluetooth वॉल्‍यूम"</item>
+    <item msgid="4665183401128289653">"सचेत रखें"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"कम"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"रेखाओं के रूप में स्‍क्रीन पर"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfo में"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"बंद"</item>
+    <item msgid="7688197031296835369">"ओवरड्रॉ क्षेत्रों को दिखाएं"</item>
+    <item msgid="8332661909019981149">"ओवरड्रॉ काउंटर दिखाएं"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"मानक सीमा"</item>
     <item msgid="4071574792028999443">"कोई पृष्ठभूमि प्रक्रियाएं नहीं"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ce6e885..f232217 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"लॉक स्‍क्रीन पर प्रदर्शित करने के लिए पाठ लिखें"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"लॉक स्क्रीन पर उपयोगकर्ता जानकारी दिखाएं"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"उपयोगकर्ता जानकारी"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"लॉक स्क्रीन पर प्रोफ़ाइल की जानकारी दिखाएं"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"प्रोफ़ाइल की जानकारी"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"स्थान पहुंच"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"सुरक्षा"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"मेरा स्‍थान, स्‍क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेंशियल संग्रहण लॉक सेट करें"</string>
@@ -351,7 +353,7 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"स्लाइड"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"कोई सुरक्षा नहीं"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"चेहरे को अनलॉक करें"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"फेस अनलॉक"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"निम्न सुरक्षा, प्रयोगात्‍मक"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"प्रतिमान"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"मध्‍यम सुरक्षा"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"नेटवर्क बदलें"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"उपलब्‍ध नेटवर्क देखने के लिए, Wi-Fi चालू करें."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi-Fi नेटवर्क की खोज जारी है…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"आपको Wi‑Fi नेटवर्क बदलने की अनुमति नहीं है."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"अन्‍य नेटवर्क…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्‍वचालित सेटअप (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"स्‍विच करने हेतु, Control-Spacebar दबाएं"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"डिफ़ॉल्ट"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"कीबोर्ड लेआउट"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"उपयोगकर्ता शब्‍दकोश"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"व्यक्तिगत डिक्शनरी"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"व्यक्तिगत डिक्शनरी"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"व्यक्तिगत शब्दकोष"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"जोड़ें"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"शब्‍दकोश में जोड़ें"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"पिच"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"बोले गए पाठ के लहजे को प्रभावित करता है"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"भाषा"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"भाषा नहीं चुनी गई है"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"बोले गए पाठ के लिए भाषा-विशिष्ट ध्‍वनि सेट करता है"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"एक उदाहरण सुनें"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"वाक् संश्लेषण का एक संक्षिप्त प्रदर्शन चलाएं"</string>
@@ -1597,23 +1597,23 @@
     <string name="sync_failed" msgid="1696499856374109647">"समन्‍वयन विफल"</string>
     <string name="sync_active" msgid="8476943765960863040">"समन्‍वयन सक्रिय"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"समन्वयित करें"</string>
-    <string name="sync_is_failing" msgid="1591561768344128377">"सिंक को वर्तमान में समस्या आ रही है. यह शीघ्र ही वापस उपलब्ध होगा."</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"समन्वयन को वर्तमान में समस्या आ रही है. यह शीघ्र ही वापस उपलब्ध होगा."</string>
     <string name="add_account_label" msgid="7811707265834013767">"खाता जोड़ें"</string>
     <string name="background_data" msgid="5779592891375473817">"पृष्ठभूमि डेटा"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"एप्लि. किसी भी समय डेटा समन्वयित, भेज और प्राप्त कर सकते हैं"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"पृष्ठभू. डेटा अक्षम करें?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"पृष्ठभूमि डेटा को अक्षम करने से बैटरी का जीवनकाल बढ़ जाता है और डेटा उपयोग कम होता है. हो सकता है कि कुछ एप्लिकेशन अब भी पृष्ठभूमि डेटा कनेक्शन का उपयोग करते हों."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"एप्लिकेशन डेटा स्‍वत: समन्‍वयित करें"</string>
-    <string name="sync_enabled" msgid="4551148952179416813">"सिंक चालू है"</string>
-    <string name="sync_disabled" msgid="8511659877596511991">"सिंक बंद है"</string>
-    <string name="sync_error" msgid="5060969083117872149">"सिंक त्रुटि"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"समन्वयन चालू है"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"समन्वयन बंद है"</string>
+    <string name="sync_error" msgid="5060969083117872149">"समन्वयन त्रुटि"</string>
     <string name="last_synced" msgid="4242919465367022234">"अंतिम समन्‍वयन <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g> को किया गया"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"समन्वयित हो रहा है…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"बैक अप सेटिंग"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"मेरी सेटिंग का बैक अप लें"</string>
-    <string name="sync_menu_sync_now" msgid="6154608350395805683">"अभी सिंक करें"</string>
-    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"सिंक रद्द करें"</string>
-    <string name="sync_one_time_sync" msgid="6766593624598183090">"अभी सिंक करने के लिए स्पर्श करें<xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"अभी समन्वयन करें"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"समन्वयन रद्द करें"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"अभी समन्वयन करने के लिए स्पर्श करें<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">"कैलेंडर"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU के साथ आरेखित करने पर विंडो में दृश्‍यों को फ़्लैश करें"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"हार्डवेयर लेयर अप. दिखाएं"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"हार्डवेयर लेयर अपडेट होने पर हरे फ़्लैश होते हैं"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"GPU ओवरड्रॉ दिखाएं"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"सबसे अच्छे से सबसे खराब: नीला, हरा, हल्का लाल, लाल"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU ओवरड्रॉ डीबग करें"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW ओवरले अक्षम करें"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"स्‍क्रीन संयोजन के लिए हमेशा GPU का उपयोग करें"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL चिह्न सक्षम करें"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"उपयोगकर्ता और प्रोफ़ाइल"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"उपयोगकर्ता या प्रोफ़ाइल जोड़ें"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"प्रतिबंधित प्रोफ़ाइल"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"इससे पहले कि आप कोई प्रतिबंधित प्रोफ़ाइल बनाएं, आपको अपने एप्लिकेशन और व्यक्तिगत डेटा की सुरक्षा करने के लिए एक स्क्रीन लॉक सेट करना होगा."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"लॉक सेट करें"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"सेट नहीं है"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"सेट नहीं की गई - प्रतिबंधित प्रोफ़ाइल"</string>
     <string name="user_owner" msgid="3879126011135546571">"स्वामी"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"प्रचलित नाम"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"जोड़ें"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"उपयोगकर्ताओं के उनके स्वयं के एप्लिकेशन और सामग्री होती है"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"प्रतिबंधित प्रोफ़ाइल, आपके खाते से केवल एप्लिकेशन और सामग्री ही एक्सेस कर सकती हैं"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"आप अपने खाते से एप्लिकेशन और सामग्री पर एक्सेस को प्रतिबंधित कर सकते हैं"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"उपयोगकर्ता"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"प्रतिबंधित प्रोफ़ाइल"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"नया उपयोगकर्ता जोड़ें"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"अभी नहीं"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"केवल टेबलेट का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"केवल फ़ोन का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"प्रतिबंधित प्रोफ़ाइल खाते नहीं जोड़ सकती हैं"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"इस उपकरण से <xliff:g id="USER_NAME">%1$s</xliff:g> को हटाएं"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"नया उपयोगकर्ता"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"नई प्रोफ़ाइल"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"स्वयं को हटाएं?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"उपयोगकर्ता निकालें?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"प्रोफ़ाइल निकालें?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"आप इस टेबलेट पर अपने स्थान और डेटा को खो देंगे. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"आप इस फ़ोन पर अपने स्थान और डेटा को खो देंगे. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"उपयोगकर्ता का स्थान और डेटा इस टेबलेट से निकल जाएगा. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"उपयोगकर्ता का स्थान और डेटा इस फ़ोन से निकल जाएगा. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"इस प्रोफ़ाइल का स्थान और डेटा इस टेबलेट पर दिखाई नहीं देगा. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"इस प्रोफ़ाइल का स्थान और डेटा इस फ़ोन पर दिखाई नहीं देगा. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"एप्लिकेशन और सामग्री प्रतिबंध"</string>
     <string name="user_rename" msgid="8523499513614655279">"नाम बदलें"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"एप्लिकेशन सीमाएं सेट करें"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> द्वारा नियंत्रित"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"यह एप्लिकेशन प्रतिबंधित प्रोफ़ाइल में समर्थित नहीं है"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"यह एप्लिकेशन आपके खातों को एक्सेस कर सकता है"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi और मोबाइल"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Wi‑Fi और मोबाइल सेटिंग में बदलाव की अनुमति दें"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 0335e8c..6edd32e 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Lokacija"</item>
     <item msgid="255608127647030286">"Osobno"</item>
     <item msgid="4588829735729884491">"Slanje poruka"</item>
-    <item msgid="8971765125227378270">"Uređaj"</item>
+    <item msgid="886742181977884584">"Mediji"</item>
+    <item msgid="7924928667052300589">"Uređaj"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"približna lokacija"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"reprodukcija audiozapisa"</item>
     <item msgid="8374996688066472414">"čitaj međuspremnik"</item>
     <item msgid="3045529469061083747">"izmijeni međuspremnik"</item>
+    <item msgid="5124443975763747838">"medijski gumbi"</item>
+    <item msgid="4547883971364273343">"audiofokus"</item>
+    <item msgid="2603878814882344450">"glavna glasnoća"</item>
+    <item msgid="7136963238377062018">"glasnoća glasa"</item>
+    <item msgid="4270236897655923007">"glasnoća zvona"</item>
+    <item msgid="6325739889222559394">"glasnoća medija"</item>
+    <item msgid="5762123934816216821">"glasnoća alarma"</item>
+    <item msgid="785049718065337473">"glasnoća obavijesti"</item>
+    <item msgid="6700305533746877052">"glasnoća Bluetootha"</item>
+    <item msgid="2029227495214047094">"zadrži u aktivnom stanju"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokacija"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Reprodukcija audiozapisa"</item>
     <item msgid="136815868796597058">"Čitaj međuspremnik"</item>
     <item msgid="5238692940326972503">"Izmijeni međuspremnik"</item>
+    <item msgid="5753789168376302997">"Medijski gumbi"</item>
+    <item msgid="3265262911688671938">"Audiofokus"</item>
+    <item msgid="2098976479485046797">"Glavna glasnoća"</item>
+    <item msgid="5660213838861789350">"Glasnoća glasa"</item>
+    <item msgid="7983336752371254444">"Glasnoća zvona"</item>
+    <item msgid="7878027809189330917">"Glasnoća medija"</item>
+    <item msgid="7260546305036218513">"Glasnoća alarma"</item>
+    <item msgid="9103719301075748925">"Glasnoća obavijesti"</item>
+    <item msgid="7025966722295861512">"Glasnoća Bluetootha"</item>
+    <item msgid="4665183401128289653">"Zadrži u aktivnom stanju"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Na zaslonu u obliku crta"</item>
     <item msgid="120512413928262547">"U naredbi adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Isključeno"</item>
+    <item msgid="7688197031296835369">"Pokaži područja slojnih iscrtavanja"</item>
+    <item msgid="8332661909019981149">"Pokaži brojač slojnih iscrtavanja"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna granica"</item>
     <item msgid="4071574792028999443">"Nema pozadinskih procesa"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9ec9e94..7fa45c4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Unesite tekst za prikaz na zaključanom zaslonu"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Prikaži podatke o korisniku na zaključanom zaslonu"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Podaci o korisniku"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Prikaži informacije profila na zaključanom zaslonu"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informacije profila"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Pristup lokaciji"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sigurnost"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Izmijeni mrežu"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Da biste vidjeli dostupne mreže, uključite Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Traženje Wi-Fi mreža…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nemate dopuštenje za promjenu Wi‑Fi mreže."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Ostale mreže…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Više"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. postavljanje (WPS)"</string>
@@ -673,7 +674,7 @@
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prijenosna Wi-Fi žarišna točka"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Uključivanje žarišne točke…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Isključivanje žarišne točke…"</string>
-    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Aktivna je prijenosna WiFi pristupna točka <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Aktivna je prijenosna Wi-Fi pristupna točka <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Pogreška prijenosne Wi-Fi žarišne točke"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Postavljanje Wi-Fi žarišne točke"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> prijenosna Wi-Fi žarišna točka"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Za prijelaz pritisnite Ctrl i razmaknicu."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Zadano"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Izgledi tipkovnice"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Korisnički rječnik"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osobni rječnik"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobni rječnici"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Osobni rječnik"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Dodaj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Dodaj u rječnik"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Visina glasa"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Utječe na ton izgovorenog teksta"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Jezik nije odabran"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Postavlja jezik govora"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Poslušajte primjer"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Poslušajte primjer sinteze zvuka"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Bljeskanje prikaza u prozorima pri crtanju GPU-om"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Prikaži ažuriranja hardverskih slojeva"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Neka hardverski slojevi bljeskaju zeleno kad se ažuriraju"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Prikaz preoptereć. GPU-a"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Najbolje do najgoreg: plavo, zeleno, svjetlocrveno, crveno"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Ukl. pogr. GPU sl. iscrt."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Onemogući HW preklapanja"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Uvijek upotrijebi GPU kod slaganja zaslona"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogući OpenGL praćenja"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Korisnici i profili"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Dodavanje korisnika ili profila"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ograničeni profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Prije izrade ograničenog profila trebate postaviti zaključavanje zaslona radi zaštite svojih aplikacija i osobnih podataka."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Postavi zaključavanje"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nije postavljen"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Nije postavljen – ograničeni profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Vlasnik"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Nadimak"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Dodavanje"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Korisnici imaju vlastite aplikacije i sadržaj"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Ograničeni profili mogu pristupati samo aplikacijama i sadržaju s vaših računa"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Možete ograničiti pristup aplikacijama i sadržaju sa svojeg računa"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Korisnik"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ograničeni profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj novog korisnika"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ne sad"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Samo vlasnik tabletnog računala može upravljati korisnicima."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Samo vlasnik telefona može upravljati korisnicima."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ograničeni profili ne mogu dodavati račune"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g>: brisanje s uređaja"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novi korisnik"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novi profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Izbrisati sebe?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Ukloniti korisnika?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Ukloniti profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Izgubit ćete svoj prostor i podatke na ovom tabletnom računalu. Ta se radnja ne može poništiti."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Izgubit ćete svoj prostor i podatke na ovom telefonu. Ta se radnja ne može poništiti."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Prostor i podaci tog korisnika nestat će s ovog tabletnog računala. Ta se radnja ne može poništiti."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Prostor i podaci tog korisnika nestat će s ovog telefona. Ta se radnja ne može poništiti."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Prostor i podaci tog profila nestat će s ovog tableta. Tu radnju nije moguće poništiti."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Prostor i podaci tog profila nestat će s ovog telefona. Tu radnju nije moguće poništiti."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Ograničenja aplikacija i sadržaja"</string>
     <string name="user_rename" msgid="8523499513614655279">"PREIMENOVANJE"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Postavljanje ograničenja aplikacije"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontrolira aplikacija <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ta aplikacija nije podržana u ograničenim profilima"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ta aplikacija može pristupiti vašim računima"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi i mobilne mreže"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Dopusti izmjenu postavki Wi‑Fi i mobilne mreže"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 8903742..1388219 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Hely"</item>
     <item msgid="255608127647030286">"Személyes"</item>
     <item msgid="4588829735729884491">"Üzenetváltás"</item>
-    <item msgid="8971765125227378270">"Eszköz"</item>
+    <item msgid="886742181977884584">"Média"</item>
+    <item msgid="7924928667052300589">"Eszköz"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"hozzávetőleges helymeghatározás"</item>
@@ -246,7 +247,7 @@
     <item msgid="6546959730920410907">"hívásnapló módosítása"</item>
     <item msgid="446877710771379667">"naptár olvasása"</item>
     <item msgid="7674458294386319722">"naptár módosítása"</item>
-    <item msgid="8281201165558093009">"wi-fi hálózat keresése"</item>
+    <item msgid="8281201165558093009">"Wi-Fi hálózat keresése"</item>
     <item msgid="8694611243479480497">"értesítés"</item>
     <item msgid="7776439107987345446">"hálózatkeresés"</item>
     <item msgid="514615766544675057">"telefonálás"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"hanganyag lejátszása"</item>
     <item msgid="8374996688066472414">"vágólap olvasása"</item>
     <item msgid="3045529469061083747">"vágólap módosítása"</item>
+    <item msgid="5124443975763747838">"médiagombok"</item>
+    <item msgid="4547883971364273343">"audiofókusz"</item>
+    <item msgid="2603878814882344450">"hangerő-szabályozó"</item>
+    <item msgid="7136963238377062018">"beszéd hangereje"</item>
+    <item msgid="4270236897655923007">"csengés hangereje"</item>
+    <item msgid="6325739889222559394">"média hangereje"</item>
+    <item msgid="5762123934816216821">"ébresztés hangereje"</item>
+    <item msgid="785049718065337473">"értesítés hangereje"</item>
+    <item msgid="6700305533746877052">"bluetooth hangereje"</item>
+    <item msgid="2029227495214047094">"ébren tartás"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Hely"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Hanganyag lejátszása"</item>
     <item msgid="136815868796597058">"Vágólap olvasása"</item>
     <item msgid="5238692940326972503">"Vágólap módosítása"</item>
+    <item msgid="5753789168376302997">"Médiagombok"</item>
+    <item msgid="3265262911688671938">"Audiofókusz"</item>
+    <item msgid="2098976479485046797">"Hangerő-szabályozó"</item>
+    <item msgid="5660213838861789350">"Beszéd hangereje"</item>
+    <item msgid="7983336752371254444">"Csengés hangereje"</item>
+    <item msgid="7878027809189330917">"Média hangereje"</item>
+    <item msgid="7260546305036218513">"Ébresztés hangereje"</item>
+    <item msgid="9103719301075748925">"Értesítés hangereje"</item>
+    <item msgid="7025966722295861512">"Bluetooth hangereje"</item>
+    <item msgid="4665183401128289653">"Ébren tartás"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Rövid"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"A képernyőn sorként"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfo elemben"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Ki"</item>
+    <item msgid="7688197031296835369">"Tartalom-felülírási területek mutatása"</item>
+    <item msgid="8332661909019981149">"Tartalom-felülírási számláló mutatása"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Normál korlátozás"</item>
     <item msgid="4071574792028999443">"Nincsenek háttérfolyamatok"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index cbc1485..d82f678 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Írja be a lezárt képernyőn megjelenítendő szöveget"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Felhasználói adatok megjelenítése zárolt képernyőn"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Felhasználói adatok"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Profiladatok megjelenítése a lezáró képernyőn"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiladatok"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Helyhozzáférés"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Biztonság"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Saját pozíció beállítása, képernyőzár feloldása, SIM-kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Hálózat módosítása"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Kapcsolja be a Wi-Fit a hálózatok megjelenítéséhez"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi-Fi hálózatok keresése..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nincs jogosultsága a Wi‑Fi hálózat módosítására."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Másik hálózat..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Egyebek"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. beállítás (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Váltáshoz nyomja meg a Control+szóköz billentyűkódot"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Alapértelmezett"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Billentyűzetkiosztások"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Felhasználói szótár"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Személyes szótár"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Személyes szótárak"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Személyes szótár"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Hozzáadás"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Hozzáadás a szótárhoz"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Hangmagasság"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"A beszélt szöveg hangszínét befolyásolja"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Nyelv"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nincs nyelv kiválasztva"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Beállítja a beszélt szöveg nyelvspecifikus hangját"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Példa meghallgatása"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Rövid demonstráció megtekintése a beszédszintézisről"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Ablakbeli nézetek villognak GPU-s rajznál."</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Hardverréteg-frissítések"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Frissítéskor a hardverrétegek zölden villognak"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"GPU-kitakarás megjelenít."</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Legjobbtól a legrosszabbig: kék, zöld, piros"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU tartalom-felülírási hibakeresés"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW fedvények letiltása"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Mindig a GPU használata képernyő-feldolgozáshoz"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL nyomon követése"</string>
@@ -1828,6 +1827,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Felhasználók és profilok"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Felhasználó vagy profil hozzáadása"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Korlátozott jogokkal rendelkező profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Mielőtt létrehozhatna egy korlátozott profilt, be kell állítania egy képernyőzárat, hogy megvédje alkalmazásait és személyes adatait."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Képernyőzár beállítása"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nincs beállítva"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Nincs létrehozva – Korlátozott jogokkal rendelkező profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Tulajdonos"</string>
@@ -1835,7 +1836,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Becenév"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Hozzáadás"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"A felhasználóknak saját alkalmazásaik és tartalmaik vannak"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"A korlátozott jogokkal rendelkező profilok csak az Ön fiókjaiban lévő alkalmazásokat és tartalmakat tudják elérni"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Korlátozhatja az alkalmazásokhoz és tartalmakhoz való hozzáférést a fiókjából"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Felhasználó"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Korlátozott profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Új felhasználó hozzáadása"</string>
@@ -1848,23 +1849,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Most nem"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Csak a táblagép tulajdonosa kezelheti a felhasználókat."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Csak a telefon tulajdonosa kezelheti a felhasználókat."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Korlátozott profilok nem adhatnak hozzá fiókokat"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> törlése"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Új felhasználó"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Új profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Törli önmagát?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Törli a felhasználót?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Eltávolítja a profilt?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Az Ön tárhelye és adatai el fognak tűnni a táblagépről. Ezt a műveletet nem lehet visszavonni."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Az Ön tárhelye és adatai el fognak tűnni a telefonról. Ezt a műveletet nem lehet visszavonni."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"A felhasználó tárhelye és adatai el fognak tűnni a táblagépről. Ezt a műveletet nem lehet visszavonni."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"A felhasználó tárhelye és adatai el fognak tűnni a telefonról. Ezt a műveletet nem lehet visszavonni."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"A profil tárhelye és adatai el fognak tűnni a táblagépről. Ezt a műveletet nem lehet visszavonni."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"A profil tárhelye és adatai el fognak tűnni a telefonról. Ezt a műveletet nem lehet visszavonni."</string>
     <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>
@@ -1881,12 +1878,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Alkalmazás- és tartalomkorlátozások"</string>
     <string name="user_rename" msgid="8523499513614655279">"ÁTNEVEZÉS"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Alkalmazáskorlátozások beállítása"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"A(z) <xliff:g id="APP">%1$s</xliff:g> irányítja"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Az alkalmazás nem támogatott korlátozott profilok esetében"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ez az alkalmazás hozzáfér az Ön fiókjaihoz"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi és mobil"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Lehetővé teszi a Wi‑Fi és mobilbeállítások módosítását."</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index baa34d0..9cf56ef 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Lokasi"</item>
     <item msgid="255608127647030286">"Pribadi"</item>
     <item msgid="4588829735729884491">"Perpesanan"</item>
-    <item msgid="8971765125227378270">"Perangkat"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Perangkat"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"lokasi sementara"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"putar audio"</item>
     <item msgid="8374996688066472414">"baca papan klip"</item>
     <item msgid="3045529469061083747">"ubah papan klip"</item>
+    <item msgid="5124443975763747838">"tombol media"</item>
+    <item msgid="4547883971364273343">"fokus audio"</item>
+    <item msgid="2603878814882344450">"volume master"</item>
+    <item msgid="7136963238377062018">"volume suara"</item>
+    <item msgid="4270236897655923007">"volume dering"</item>
+    <item msgid="6325739889222559394">"volume media"</item>
+    <item msgid="5762123934816216821">"volume alarm"</item>
+    <item msgid="785049718065337473">"volume pemberitahuan"</item>
+    <item msgid="6700305533746877052">"volume bluetooth"</item>
+    <item msgid="2029227495214047094">"tetap aktif"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokasi"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Putar audio"</item>
     <item msgid="136815868796597058">"Baca papan klip"</item>
     <item msgid="5238692940326972503">"Ubah papan klip"</item>
+    <item msgid="5753789168376302997">"Tombol media"</item>
+    <item msgid="3265262911688671938">"Fokus audio"</item>
+    <item msgid="2098976479485046797">"Volume utama"</item>
+    <item msgid="5660213838861789350">"Volume suara"</item>
+    <item msgid="7983336752371254444">"Volume dering"</item>
+    <item msgid="7878027809189330917">"Volume media"</item>
+    <item msgid="7260546305036218513">"Volume alarm"</item>
+    <item msgid="9103719301075748925">"Volume pemberitahuan"</item>
+    <item msgid="7025966722295861512">"Volume bluetooth"</item>
+    <item msgid="4665183401128289653">"Tetap aktif"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Singkat"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Di layar dalam bentuk garis"</item>
     <item msgid="120512413928262547">"Di adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Nonaktif"</item>
+    <item msgid="7688197031296835369">"Tampilkan area overdraw"</item>
+    <item msgid="8332661909019981149">"Lihat penghitung overdraw"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Batas standar"</item>
     <item msgid="4071574792028999443">"Tanpa proses latar belakang"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f3760b6..7275e7d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ketikkan teks untuk ditampilkan pada layar kunci"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Tampilkan info pengguna pada layar pengunci"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Info pengguna"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Tampilkan info profil di layar kunci"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Info profil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Akses lokasi"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Keamanan"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
@@ -555,7 +557,7 @@
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Untuk meningkatkan akurasi 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_title" msgid="5149574280392680092">"Biarkan Wi-Fi nyala saat 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>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalkan penggunaan baterai saat Wi-Fi aktif"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah jaringan"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Lihat jaringan yang ada dengan menyalakan Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Menelusuri jaringan Wi-Fi..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Anda tidak memiliki izin untuk mengubah jaringan Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Jaringan lain..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lainnya"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Penyiapan otomatis (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Untuk beralih, tekan Control-Spasi"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tata letak keyboard"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamus pengguna"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamus pribadi"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Kamus pribadi"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Kamus pribadi"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Tambahkan"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Tambahkan ke kamus"</string>
@@ -1345,7 +1344,7 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pembesaran layar"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Perbarui otomatis pembesaran layar"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Perbarui pembesaran layar di transisi aplikasi"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tombol daya - tutup telepon  panggilan"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tombol daya - tutup telepon"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Ucapkan sandi"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Penundaan sentuh &amp; tahan"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Setelan"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tinggi nada"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mempengaruhi nada teks yang disampaikan"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Bahasa"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Bahasa tidak dipilih"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Menyetel suara spesifik bahasa untuk teks lisan"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Dengarkan contoh"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Putar demonstrasi singkat dari sintesis suara"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Tampilan cepat dlm jendela saat digambar dgn GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Tunjukkan pembaruan lapisan hardware"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Lapisan hardware berkedip hijau saat memperbarui"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Tampilkan kelebihan GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Terbaik-terburuk: biru, hijau, merah terang, merah"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Debug overdraw oleh GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Nonaktifkan lapisan HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Selalu gunakan GPU untuk pengomposisian layar"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktifkan jejak OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Pengguna &amp; profil"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Tambahkan pengguna atau profil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil dibatasi"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Sebelum dapat membuat profil yang dibatasi, Anda perlu menyiapkan kunci layar untuk melindungi aplikasi dan data pribadi Anda."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Setel kunci"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Tidak disiapkan"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Tidak disiapkan - Profil dibatasi"</string>
     <string name="user_owner" msgid="3879126011135546571">"Pemilik"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Nama julukan"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Tambahkan"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Pengguna memiliki aplikasi dan konten mereka sendiri"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Profil yang dibatasi hanya dapat mengakses aplikasi dan konten dari akun Anda"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Anda dapat membatasi akses ke aplikasi dan konten dari akun Anda"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Pengguna"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil dibatasi"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Tambahkan pengguna baru"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Tidak sekarang"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Hanya pemilik tablet yang dapat mengelola pengguna."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Hanya pemilik ponsel yang dapat mengelola pengguna."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profil yang dibatasi tidak dapat menambahkan akun"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Hapus <xliff:g id="USER_NAME">%1$s</xliff:g> di perangkat"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Pengguna baru"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Profil baru"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Hapus diri Anda sendiri?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Hapus pengguna"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Hapus profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Ruang dan data Anda akan hilang dari tablet ini. Anda tidak dapat mengurungkan tindakan ini."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Ruang dan data Anda akan hilang dari ponsel ini. Anda tidak dapat mengurungkan tindakan ini."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Ruang dan data pengguna ini akan hilang dari tablet ini. Anda tidak dapat mengurungkan tindakan ini."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Ruang dan data pengguna ini akan hilang dari ponsel ini. Anda tidak dapat mengurungkan tindakan ini."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Ruang dan data profil akan hilang dari tablet ini. Anda tidak dapat mengurungkan tindakan ini."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Ruang dan data profil akan hilang dari ponsel ini. Anda tidak dapat mengurungkan tindakan ini."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Pembatasan aplikasi dan konten"</string>
     <string name="user_rename" msgid="8523499513614655279">"GANTI NAMA"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Setel batas aplikasi"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Dikontrol oleh <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Aplikasi ini tidak didukung dalam profil yang dibatasi"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Aplikasi ini dapat mengakses akun Anda"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi dan Seluler"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Memungkinkan modifikasi setelan Wi‑Fi dan Seluler"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 8763dc4..b8ddfe3 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Posizione"</item>
     <item msgid="255608127647030286">"Personali"</item>
     <item msgid="4588829735729884491">"Messaggi"</item>
-    <item msgid="8971765125227378270">"Dispositivo"</item>
+    <item msgid="886742181977884584">"Contenuti multimediali"</item>
+    <item msgid="7924928667052300589">"Dispositivo"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"posizione approssimativa"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"riproduzione audio"</item>
     <item msgid="8374996688066472414">"lettura degli appunti"</item>
     <item msgid="3045529469061083747">"modifica degli appunti"</item>
+    <item msgid="5124443975763747838">"pulsanti contenuti multimediali"</item>
+    <item msgid="4547883971364273343">"focus audio"</item>
+    <item msgid="2603878814882344450">"volume principale"</item>
+    <item msgid="7136963238377062018">"volume voce"</item>
+    <item msgid="4270236897655923007">"volume suoneria"</item>
+    <item msgid="6325739889222559394">"volume contenuti multimediali"</item>
+    <item msgid="5762123934816216821">"volume allarme"</item>
+    <item msgid="785049718065337473">"volume notifiche"</item>
+    <item msgid="6700305533746877052">"volume bluetooth"</item>
+    <item msgid="2029227495214047094">"mantieni attivo"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Posizione"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Riproduzione audio"</item>
     <item msgid="136815868796597058">"Lettura degli appunti"</item>
     <item msgid="5238692940326972503">"Modifica degli appunti"</item>
+    <item msgid="5753789168376302997">"Pulsanti contenuti multimediali"</item>
+    <item msgid="3265262911688671938">"Focus audio"</item>
+    <item msgid="2098976479485046797">"Volume principale"</item>
+    <item msgid="5660213838861789350">"Volume voce"</item>
+    <item msgid="7983336752371254444">"Volume suoneria"</item>
+    <item msgid="7878027809189330917">"Volume contenuti multimediali"</item>
+    <item msgid="7260546305036218513">"Volume allarme"</item>
+    <item msgid="9103719301075748925">"Volume notifiche"</item>
+    <item msgid="7025966722295861512">"Volume Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mantieni attivo"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Breve"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Su schermo sotto forma di linee"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Off"</item>
+    <item msgid="7688197031296835369">"Mostra aree overdraw"</item>
+    <item msgid="8332661909019981149">"Mostra contatore overdraw"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite standard"</item>
     <item msgid="4071574792028999443">"Nessun processo in background"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 003bb0a..b6c0e20 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Digita testo da visualizzare su blocco schermo"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostra info utente in schermata blocco"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Dati utente"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostra info profilo in schermata di blocco"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informazioni profilo"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Accesso alla posizione"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sicurezza"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica rete"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Per visualizzare le reti disponibili, attiva Wi‑Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Ricerca reti Wi‑Fi in corso…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Non disponi dell\'autorizzazione per cambiare la rete Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Altra rete…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Altro"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configurazione auto (WPS)"</string>
@@ -1050,7 +1051,7 @@
     <string name="activity_not_found" msgid="5551664692991605325">"Applicazione non installata sul telefono."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestisci applicazioni"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestisci e rimuovi applicazioni installate"</string>
-    <string name="applications_settings" msgid="1721442176406964682">"Applicazioni"</string>
+    <string name="applications_settings" msgid="1721442176406964682">"App"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gestisci le applicazioni, imposta le scorciatoie di avvio rapido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Impostazioni applicazioni"</string>
     <string name="install_applications" msgid="4872012136210802181">"Origini sconosciute"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Cambia premendo Ctrl-Barra spaziatr."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predefinita"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Layout tastiera"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dizionario utente"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dizionario personale"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dizionari personali"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dizionario personale"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Aggiungi"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Aggiungi al dizionario"</string>
@@ -1268,7 +1267,7 @@
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"La scorciatoia per <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) verrà cancellata."</string>
     <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
     <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Annulla"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Applicazioni"</string>
+    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"App"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Scorciatoie"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Inserimento testo"</string>
     <string name="input_method" msgid="5434026103176856164">"Metodo inserimento"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tono"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Interessa il tono del testo parlato"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Lingua"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Lingua non selezionata"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Imposta la voce specifica della lingua per il testo parlato"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ascolta un esempio"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Riproduci una breve dimostrazione della sintesi vocale"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash delle visualizzazioni dentro le finestre se disegnate con GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Aggiornam. livelli hardware"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Lampeggia verde se aggiornam. livelli hardware"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Mostra overdraw GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Dal migliore al peggiore: blu, verde, rosso chiaro, rosso"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Debug overdraw GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Disabilita overlay HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per la composizione dello schermo"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Attiva tracce OpenGL"</string>
@@ -1691,7 +1690,7 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Scala animazione transizione"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Scala durata animatore"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simula display secondari"</string>
-    <string name="debug_applications_category" msgid="4206913653849771549">"Applicazioni"</string>
+    <string name="debug_applications_category" msgid="4206913653849771549">"App"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Non conservare attività"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Elimina ogni attività appena l\'utente la interrompe"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limite processi background"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Utenti e profili"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Aggiungi utente o profilo"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profilo con limitazioni"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Prima di poter creare un profilo con limitazioni, devi impostare un blocco schermo per proteggere le tue app e i tuoi dati personali."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Imposta blocco"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Non configurato"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Non impostato - Profilo con limitazioni"</string>
     <string name="user_owner" msgid="3879126011135546571">"Proprietario"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Nickname"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Aggiungi"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Gli utenti hanno applicazioni e contenuti personali"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"I profili con limitazioni possono accedere alle applicazioni e ai contenuti solo dai tuoi account"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Puoi limitare l\'accesso alle applicazioni e ai contenuti dal tuo account"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utente"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profilo con limitazioni"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Aggiungi nuovo utente"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Non ora"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Solo il proprietario del tablet può gestire gli utenti."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Solo il proprietario del telefono può gestire gli utenti."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"I profili con limitazioni non possono aggiungere account"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Elimina <xliff:g id="USER_NAME">%1$s</xliff:g> da dispositivo"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nuovo utente"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nuovo profilo"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Eliminare te stesso?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Rimuovere l\'utente?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Rimuovere il profilo?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Perderai il tuo spazio e i tuoi dati sul tablet. Non è possibile annullare l\'azione."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Perderai il tuo spazio e i tuoi dati sul telefono. Non è possibile annullare l\'azione."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Lo spazio e i dati dell\'utente scompariranno dal tablet. Non è possibile annullare l\'azione."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Lo spazio e i dati dell\'utente scompariranno dal telefono. Non è possibile annullare l\'azione."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Lo spazio e i dati del profilo scompariranno dal tablet. Non è possibile annullare l\'azione."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Lo spazio e i dati del profilo scompariranno dal telefono. Non è possibile annullare l\'azione."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Limitazioni per app e contenuti"</string>
     <string name="user_rename" msgid="8523499513614655279">"RINOMINA"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Imposta limiti applicazione"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controllate da <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Questa app non è supportata nei profili con limitazioni"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Questa app può accedere ai tuoi account"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi e mobile"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Consenti la modifica di impostazioni Wi‑Fi e rete mobile"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 63566bb..09bdc6b 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"מיקום"</item>
     <item msgid="255608127647030286">"אישי"</item>
     <item msgid="4588829735729884491">"העברת הודעות"</item>
-    <item msgid="8971765125227378270">"מכשיר"</item>
+    <item msgid="886742181977884584">"מדיה"</item>
+    <item msgid="7924928667052300589">"מכשיר"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"מיקום משוער"</item>
@@ -246,7 +247,7 @@
     <item msgid="6546959730920410907">"שנה יומן שיחות"</item>
     <item msgid="446877710771379667">"קרא יומן"</item>
     <item msgid="7674458294386319722">"שנה לוח שנה"</item>
-    <item msgid="8281201165558093009">"סריקת wi-fi"</item>
+    <item msgid="8281201165558093009">"סריקת Wi-Fi"</item>
     <item msgid="8694611243479480497">"התראה"</item>
     <item msgid="7776439107987345446">"סריקה סלולרית"</item>
     <item msgid="514615766544675057">"שיחת טלפון"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"הפעל את האודיו"</item>
     <item msgid="8374996688066472414">"קרא לוח"</item>
     <item msgid="3045529469061083747">"שנה לוח"</item>
+    <item msgid="5124443975763747838">"לחצני מדיה"</item>
+    <item msgid="4547883971364273343">"מיקוד אודיו"</item>
+    <item msgid="2603878814882344450">"שליטה ראשית בעוצמת קול"</item>
+    <item msgid="7136963238377062018">"עוצמת קול של דיבור"</item>
+    <item msgid="4270236897655923007">"עוצמת קול של צלצול"</item>
+    <item msgid="6325739889222559394">"עוצמת קול של מדיה"</item>
+    <item msgid="5762123934816216821">"עוצמת קול של התרעה"</item>
+    <item msgid="785049718065337473">"עוצמת קול של התראה"</item>
+    <item msgid="6700305533746877052">"עוצמת קול של Bluetooth"</item>
+    <item msgid="2029227495214047094">"שמור במצב פעיל"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"מיקום"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"הפעל את האודיו"</item>
     <item msgid="136815868796597058">"קרא לוח"</item>
     <item msgid="5238692940326972503">"שנה לוח"</item>
+    <item msgid="5753789168376302997">"לחצני מדיה"</item>
+    <item msgid="3265262911688671938">"מיקוד אודיו"</item>
+    <item msgid="2098976479485046797">"שליטה ראשית בעוצמת קול"</item>
+    <item msgid="5660213838861789350">"עוצמת קול של דיבור"</item>
+    <item msgid="7983336752371254444">"עוצמת קול של צלצול"</item>
+    <item msgid="7878027809189330917">"עוצמת קול של מדיה"</item>
+    <item msgid="7260546305036218513">"עוצמת קול של התראה"</item>
+    <item msgid="9103719301075748925">"עוצמת קול של התראות"</item>
+    <item msgid="7025966722295861512">"עוצמת קול של Bluetooth"</item>
+    <item msgid="4665183401128289653">"שמור במצב פעיל"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"קצר"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"במסך כקווים"</item>
     <item msgid="120512413928262547">"ב-adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"כבוי"</item>
+    <item msgid="7688197031296835369">"הצגת אזורים עם חריגה"</item>
+    <item msgid="8332661909019981149">"הצגת מונה חריגות"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"הגבלת תקן"</item>
     <item msgid="4071574792028999443">"אין תהליכים ברקע"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 53c3030..8472efd 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"הקלד טקסט להצגה בנעילת המסך"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"הצג פרטי משתמש במסך הנעילה"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"פרטי משתמש"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"הצג פרטי פרופיל במסך הנעילה"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"פרטי פרופיל"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"גישה למיקום"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"אבטחה"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"שנה רשת"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"כדי לראות רשתות זמינות, הפעל את ה-Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"מחפש רשתות Wi-Fi…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"אין לך הרשאה לשנות את רשת ה-Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"רשת אחרת..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"עוד"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"התקנה אוטומטית (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"כדי להחליף פריסה, הקש Control-מקש רווח"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ברירת מחדל"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"פריסות מקלדת"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"מילון משתמש"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"מילון אישי"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"מילונים אישיים"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"מילון אישי"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"הוסף"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"הוסף למילון"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"גובה צליל"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"משפיע על הטון של הטקסט הנאמר"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"שפה"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"לא נבחרה שפה"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"מגדיר קול ספציפי לשפה עבור הטקסט הנאמר"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"האזן לדוגמה"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"הפעל הדגמה קצרה של סינתזת דיבור"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"הבזק תצוגות בתוך חלונות בעת ציור באמצעות ה-GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"הצג עדכוני שכבות חומרה"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"הצג הבהוב ירוק לשכבות חומרה כשהן מתעדכנות"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"הצג שימוש יתר של GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"מהטוב ביותר להכי גרוע: כחול, ירוק, אדום בהיר, אדום"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"חריגה בניקוי באגים ב-GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"השבת שכבות על של HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"השתמש תמיד ב-GPU להרכבת מסך"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"הפעל מעקבי OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"משתמשים ופרופילים"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"הוסף משתמש או פרופיל"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"פרופיל מוגבל"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"לפני שתוכל ליצור פרופיל מוגבל, תצטרך להגדיר נעילת מסך כדי להגן על היישומים ועל הנתונים האישיים שלך."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"הגדר נעילה"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"לא מוגדר"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"לא מוגדר - פרופיל מוגבל"</string>
     <string name="user_owner" msgid="3879126011135546571">"בעלים"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"כינוי"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"הוספה"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"למשתמשים יש יישומים ותוכן משלהם"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"פרופילים מוגבלים יכולים רק לגשת ליישומים ולתוכן מהחשבונות שלך"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"ניתן להגביל את הגישה לאפליקציות ולתוכן מהחשבון שלך"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"משתמש"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"פרופיל מוגבל"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"הוסף משתמש חדש"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"לא עכשיו"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"רק הבעלים של הטאבלט יכול לנהל משתמשים."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"רק הבעלים של הטלפון יכול לנהל משתמשים."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"פרופילים מוגבלים לא יכולים להוסיף חשבונות"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"מחק את <xliff:g id="USER_NAME">%1$s</xliff:g> ממכשיר זה"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"משתמש חדש"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"פרופיל חדש"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"האם למחוק אותך?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"האם להסיר משתמש?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"האם להסיר את הפרופיל?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"תאבד את השטח ואת והנתונים שלך בטאבלט. לא ניתן לבטל פעולה זו."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"תאבד את השטח ואת והנתונים שלך בטלפון. לא ניתן לבטל פעולה זו."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"השטח והנתונים של משתמש זה ייעלמו מהטאבלט. לא ניתן לבטל פעולה זו."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"השטח והנתונים של משתמש זה ייעלמו מהטלפון. לא ניתן לבטל פעולה זו."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"השטח והנתונים של הפרופיל הזה ייעלמו מהטאבלט. לא ניתן לבטל את הפעולה הזו."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"השטח והנתונים של הפרופיל הזה ייעלמו מהטלפון. לא ניתן לבטל את הפעולה הזו."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"הגבלות על אפליקציות ותוכן"</string>
     <string name="user_rename" msgid="8523499513614655279">"שנה שם"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"הגדר הגבלות ליישום"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"בשליטת <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"יישום זה אינו נתמך בפרופילים מוגבלים"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"היישום הזה יכול לגשת לחשבונות שלך"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"רשת Wi‑Fi ורשת לנייד"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"אפשר שינוי של הגדרות רשת Wi-Fi ורשת לנייד"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 21f877d..dbed561 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"位置情報"</item>
     <item msgid="255608127647030286">"プライベート"</item>
     <item msgid="4588829735729884491">"メッセージ"</item>
-    <item msgid="8971765125227378270">"端末"</item>
+    <item msgid="886742181977884584">"メディア"</item>
+    <item msgid="7924928667052300589">"端末"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"おおよその位置情報"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"音声の再生"</item>
     <item msgid="8374996688066472414">"クリップボードの読み取り"</item>
     <item msgid="3045529469061083747">"クリップボードの変更"</item>
+    <item msgid="5124443975763747838">"メディアボタン"</item>
+    <item msgid="4547883971364273343">"音声フォーカス"</item>
+    <item msgid="2603878814882344450">"主音量"</item>
+    <item msgid="7136963238377062018">"音声の音量"</item>
+    <item msgid="4270236897655923007">"着信音の音量"</item>
+    <item msgid="6325739889222559394">"メディアの音量"</item>
+    <item msgid="5762123934816216821">"アラームの音量"</item>
+    <item msgid="785049718065337473">"通知音量"</item>
+    <item msgid="6700305533746877052">"Bluetoothの音量"</item>
+    <item msgid="2029227495214047094">"スリープモードにしない"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置情報"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"音声の再生"</item>
     <item msgid="136815868796597058">"クリップボードの読み取り"</item>
     <item msgid="5238692940326972503">"クリップボードの変更"</item>
+    <item msgid="5753789168376302997">"メディアボタン"</item>
+    <item msgid="3265262911688671938">"音声フォーカス"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"音声の音量"</item>
+    <item msgid="7983336752371254444">"着信音の音量"</item>
+    <item msgid="7878027809189330917">"メディアの音量"</item>
+    <item msgid="7260546305036218513">"アラームの音量"</item>
+    <item msgid="9103719301075748925">"通知の音量"</item>
+    <item msgid="7025966722295861512">"Bluetoothの音量"</item>
+    <item msgid="4665183401128289653">"スリープモードにしない"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短め"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"行として画面に表示"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfoを使用"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"OFF"</item>
+    <item msgid="7688197031296835369">"オーバードロー領域の表示"</item>
+    <item msgid="8332661909019981149">"オーバードローカウンタの表示"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準の上限"</item>
     <item msgid="4071574792028999443">"バックグラウンドプロセスを使用しない"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e03695c..cb844ce 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -311,6 +311,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"ロック画面に表示するテキストを入力します"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"ロック画面にユーザー情報を表示"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"ユーザー情報"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"ロック画面にプロフィール情報を表示"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"プロフィール情報"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"位置情報アクセス"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"セキュリティ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
@@ -574,8 +576,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ネットワークを変更"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"利用可能なネットワークを表示するにはWi-FiをON"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi-Fiネットワークを検索しています…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Wi-Fiネットワークを変更する権限がありません。"</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"他のネットワーク…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"その他"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定(WPS)"</string>
@@ -1236,9 +1237,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"切り替えるにはCtrl+スペースを押します"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"デフォルト"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"キーボードレイアウト"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"単語リスト"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"ユーザー辞書"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"ユーザー辞書"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"ユーザー辞書"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"追加"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"辞書に追加"</string>
@@ -1458,6 +1457,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音の高さ"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"テキスト読み上げの音程を変更する"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"言語"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"言語が選択されていません"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"テキスト読み上げに使用する言語固有の音声を設定する"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"サンプルを再生"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"音声合成の短いサンプルを再生する"</string>
@@ -1678,8 +1678,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPUでの描画時にウィンドウ内の表示を点滅させる"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"ハードウェア層情報を表示"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"ハードウェア層が更新されると緑を表示"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"GPUオーバードローを表示"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"良好な状態から順に: 青、緑、薄い赤、赤"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPUオーバードローをデバッグ"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HWオーバーレイを無効"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"画面合成に常にGPUを使用する"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGLトレースを有効化"</string>
@@ -1832,6 +1831,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"ユーザーとプロフィール"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"ユーザーまたはプロフィールを追加"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"制限付きプロフィール"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"制限付きプロフィールを作成する場合は、アプリや個人データを保護するように画面ロックを設定しておく必要があります。"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"ロックを設定"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"セットアップしていません"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"セットアップしていません - 制限付きプロフィール"</string>
     <string name="user_owner" msgid="3879126011135546571">"所有者"</string>
@@ -1839,7 +1840,8 @@
     <string name="user_nickname" msgid="5148818000228994488">"ニックネーム"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"追加"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"ユーザーは自分のアプリとコンテンツを持っています"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"制限付きプロフィールは、アカウントのアプリとコンテンツにしかアクセスできません。"</string>
+    <!-- no translation found for user_add_profile_item_summary (5931663986889138941) -->
+    <skip />
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ユーザー"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"制限付きプロフィール"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"新しいユーザーを追加する"</string>
@@ -1852,23 +1854,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"後で行う"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"ユーザーを管理できるのはタブレットの所有者のみです。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"ユーザーを管理できるのは携帯端末の所有者のみです。"</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"制限付きプロフィールではアカウントを追加できません"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"この端末から<xliff:g id="USER_NAME">%1$s</xliff:g>を削除"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新しいユーザー"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"新しいプロフィール"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"自分を削除しますか?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"ユーザーを削除しますか?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"プロフィールを削除しますか?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"このタブレットのスペースとデータが失われます。この操作は元に戻せません。"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"この携帯端末のスペースとデータが失われます。この操作は元に戻せません。"</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"このユーザーのスペースとデータがタブレットから消去されます。この操作は元に戻せません。"</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"このユーザーのスペースとデータが携帯端末から消去されます。この操作は元に戻せません。"</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"このプロフィールのスペースとデータがタブレットから消去されます。この操作は元に戻せません。"</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"このプロフィールのスペースとデータが携帯電話から消去されます。この操作は元に戻せません。"</string>
     <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>
@@ -1885,12 +1883,12 @@
     <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>
+    <!-- no translation found for user_restrictions_title (7745810037152772035) -->
+    <skip />
     <string name="user_rename" msgid="8523499513614655279">"名前を変更"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"アプリの制限を設定"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g>が制御"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"このアプリは制限付きプロフィールではサポートされていません"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"このアプリはアカウントにアクセスする場合があります"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fiとモバイル"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Wi-Fiとモバイルの設定の変更を許可する"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index ab1d5f8..ac9e026 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"위치"</item>
     <item msgid="255608127647030286">"개인"</item>
     <item msgid="4588829735729884491">"메시지"</item>
-    <item msgid="8971765125227378270">"기기"</item>
+    <item msgid="886742181977884584">"미디어"</item>
+    <item msgid="7924928667052300589">"기기"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"대략적 위치"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"오디오 재생"</item>
     <item msgid="8374996688066472414">"클립보드 읽기"</item>
     <item msgid="3045529469061083747">"클립보드 수정"</item>
+    <item msgid="5124443975763747838">"미디어 버튼"</item>
+    <item msgid="4547883971364273343">"오디오 포커스"</item>
+    <item msgid="2603878814882344450">"마스터 볼륨"</item>
+    <item msgid="7136963238377062018">"음성 볼륨"</item>
+    <item msgid="4270236897655923007">"벨소리 볼륨"</item>
+    <item msgid="6325739889222559394">"미디어 볼륨"</item>
+    <item msgid="5762123934816216821">"알람 볼륨"</item>
+    <item msgid="785049718065337473">"알림 볼륨"</item>
+    <item msgid="6700305533746877052">"블루투스 볼륨"</item>
+    <item msgid="2029227495214047094">"켜진 상태로 유지"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"위치"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"오디오 재생"</item>
     <item msgid="136815868796597058">"클립보드 읽기"</item>
     <item msgid="5238692940326972503">"클립보드 수정"</item>
+    <item msgid="5753789168376302997">"미디어 버튼"</item>
+    <item msgid="3265262911688671938">"오디오 포커스"</item>
+    <item msgid="2098976479485046797">"마스터 볼륨"</item>
+    <item msgid="5660213838861789350">"음성 볼륨"</item>
+    <item msgid="7983336752371254444">"벨소리 볼륨"</item>
+    <item msgid="7878027809189330917">"미디어 볼륨"</item>
+    <item msgid="7260546305036218513">"알람 볼륨"</item>
+    <item msgid="9103719301075748925">"알림 볼륨"</item>
+    <item msgid="7025966722295861512">"블루투스 볼륨"</item>
+    <item msgid="4665183401128289653">"켜진 상태로 유지"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"짧게"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"화면에 선으로 표시"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfo에서 사용"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"OFF"</item>
+    <item msgid="7688197031296835369">"오버드로 영역 표시"</item>
+    <item msgid="8332661909019981149">"오버드로 카운터 표시"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"표준 제한"</item>
     <item msgid="4071574792028999443">"백그라운드 프로세스 없음"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 76d795a..0403f3f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"화면 잠금에 표시할 텍스트를 입력하세요."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"잠금 화면에 사용자 정보 표시"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"사용자 정보"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"잠금 화면에 프로필 정보 표시"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"프로필 정보"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"위치 정보 액세스"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"보안"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"네트워크 수정"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"사용 가능한 네트워크를 보려면 Wi-Fi를 켜세요."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi-Fi 네트워크를 찾는 중…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Wi‑Fi 네트워크를 변경할 권한이 없습니다."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"다른 네트워크…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"더보기"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"자동 설정(WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"전환하려면 Control-Spacebar를 누름"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"기본값"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"키보드 레이아웃"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"사용자 사전"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"개인 사전"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"개인 사전"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"개인 사전"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"추가"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"사전에 추가"</string>
@@ -1355,7 +1354,7 @@
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>에 필요한 기능:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"작업 살펴보기"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"앱과 상호작용할 때 알림을 받습니다."</string>
-    <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 중지할까요?"</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 중지하시겠습니까?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"확인을 터치하면 <xliff:g id="SERVICE">%1$s</xliff:g>이(가) 중지됩니다."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"설치된 서비스가 없습니다."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"스크린 리더가 필요하십니까?"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"피치"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"발음된 텍스트의 톤에 적용"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"언어"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"언어가 선택되지 않음"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"발음된 텍스트에 대해 언어별로 음성 설정"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"예제 듣기"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"짧은 음성 합성 데모 재생"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU로 드로잉했을 때 창 내부 보기 플래시 처리"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"하드웨어 업데이트 표시"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"업데이트 할 때 하드웨어 레이어 깜박이기"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"GPU 오버드로 표시"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"오버드로가 적은 순으로: 파란색, 녹색, 옅은 빨간색, 빨간색"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU 오버드로 디버깅"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW 오버레이 사용 안함"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"화면 합성 목적으로 항상 GPU 사용"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL 추적 사용 설정"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"사용자 및 프로필"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"사용자 또는 프로필 추가"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"제한된 프로필"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"제한된 프로필을 만들기 전에 화면 잠금을 설정하여 앱과 개인 데이터를 보호해야 합니다."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"잠금 설정"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"설정되지 않음"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"설정되지 않음 - 제한된 프로필"</string>
     <string name="user_owner" msgid="3879126011135546571">"소유자"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"닉네임"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"추가"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"사용자는 자신의 앱과 콘텐츠를 보유합니다."</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"제한된 프로필은 사용자 계정의 앱과 콘텐츠에만 액세스할 수 있습니다."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"내 계정의 앱 및 콘텐츠에 대한 액세스를 제한할 수 있습니다."</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"사용자"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"제한된 프로필"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"새 사용자 추가"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"나중에"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"태블릿의 소유자만 사용자를 관리할 수 있습니다."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"휴대전화의 소유자만 사용자를 관리할 수 있습니다."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"제한된 프로필은 계정을 추가할 수 없습니다."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"이 기기에서 <xliff:g id="USER_NAME">%1$s</xliff:g>님 삭제"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"새 사용자"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"새 프로필"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"본인을 삭제하시겠습니까?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"사용자를 삭제하시겠습니까?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"프로필을 삭제하시겠습니까?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"이 태블릿에 있는 내 저장 공간 및 데이터가 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"이 휴대전화에 있는 내 저장 공간 및 데이터가 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"이 사용자의 저장 공간 및 데이터가 이 태블릿에서 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"이 사용자의 저장 공간 및 데이터가 이 휴대전화에서 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"이 프로필의 저장 공간 및 데이터가 이 태블릿에서 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"이 프로필의 저장 공간 및 데이터가 이 휴대전화에서 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"애플리케이션 및 콘텐츠 제한"</string>
     <string name="user_rename" msgid="8523499513614655279">"이름 바꾸기"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"애플리케이션 한도 설정"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g>에서 관리"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"이 앱은 제한된 프로필에 지원되지 않습니다."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"이 앱은 계정에 액세스할 수 있습니다."</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi 및 모바일"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Wi‑Fi 및 모바일 설정을 수정하도록 허용"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 2fde167..7c60ae0 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Vieta"</item>
     <item msgid="255608127647030286">"Asmeninės"</item>
     <item msgid="4588829735729884491">"Susirašinėjimas žinutėmis"</item>
-    <item msgid="8971765125227378270">"Įrenginys"</item>
+    <item msgid="886742181977884584">"Medija"</item>
+    <item msgid="7924928667052300589">"Įrenginys"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"apytikslė vietovė"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"leisti garso įrašą"</item>
     <item msgid="8374996688066472414">"skaityti iškarpinę"</item>
     <item msgid="3045529469061083747">"keisti iškarpinę"</item>
+    <item msgid="5124443975763747838">"medijos mygtukai"</item>
+    <item msgid="4547883971364273343">"garso sutelktis"</item>
+    <item msgid="2603878814882344450">"pagrindinis garsumas"</item>
+    <item msgid="7136963238377062018">"balso garsumas"</item>
+    <item msgid="4270236897655923007">"skambučio garsumas"</item>
+    <item msgid="6325739889222559394">"medijos garsumas"</item>
+    <item msgid="5762123934816216821">"signalo garsumas"</item>
+    <item msgid="785049718065337473">"pranešimų garsumas"</item>
+    <item msgid="6700305533746877052">"„Bluetooth“ garsumas"</item>
+    <item msgid="2029227495214047094">"neužmigdyti"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Vietovė"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Leisti garso įrašą"</item>
     <item msgid="136815868796597058">"Skaityti iškarpinę"</item>
     <item msgid="5238692940326972503">"Keisti iškarpinę"</item>
+    <item msgid="5753789168376302997">"Medijos mygtukai"</item>
+    <item msgid="3265262911688671938">"Garso sutelktis"</item>
+    <item msgid="2098976479485046797">"Pagrindinis garsumas"</item>
+    <item msgid="5660213838861789350">"Balso garsumas"</item>
+    <item msgid="7983336752371254444">"Skambučio garsumas"</item>
+    <item msgid="7878027809189330917">"Medijos garsumas"</item>
+    <item msgid="7260546305036218513">"Signalo garsumas"</item>
+    <item msgid="9103719301075748925">"Pranešimo garsumas"</item>
+    <item msgid="7025966722295861512">"„Bluetooth“ garsumas"</item>
+    <item msgid="4665183401128289653">"Neužmigdyti"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Trumpas"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Ekrane (linijos)"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Išjungti"</item>
+    <item msgid="7688197031296835369">"Rodyti perdangos sritis"</item>
+    <item msgid="8332661909019981149">"Rodyti priešingą perdangą"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standartinis apribojimas"</item>
     <item msgid="4071574792028999443">"Nėra fono procesų"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index b94f4dd..cecd68d 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Įveskite tekstą, pateiktiną užrakinimo ekrane"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Rodyti naudotojo informaciją užrakinimo ekrane"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Naudotojo inform."</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Rodyti profilio informaciją užrakinimo ekrane"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profilio informacija"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Vietovės prieiga"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sauga"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, įgaliojimų saugyklos užraktą"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Keisti tinklą"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Kad peržiūrėt. galimus tinklus, įjunkite „Wi-Fi“."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Ieškoma „Wi-Fi“ tinklų…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Neturite leidimo keisti „Wi‑Fi“ tinklą."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Kitas tinklas…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Daugiau"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatinė sąranka (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Kad perj., pasp. vald. ir tarpo kl."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Numatytasis"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Klaviatūros išdėstymai"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Naudotojo žodynas"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Asmeninis žodynas"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Asmeniniai žodynai"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Asmeninis žodynas"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Pridėti"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Pridėti prie žodyno"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Garso aukštis"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Daro poveikį sakomo teksto tonui"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Kalba"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Kalba nepasirinkta"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nustato konkrečiai kalbai būdingą sakomo teksto balsą"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Klausytis pavyzdžio"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Paleisti trumpą kalbos sintezės demonstraciją"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"„Flash“ rodiniai languose atvaizduojant su GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Rod. apar. įr. sl. nauj."</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Kai atsin. apar. įr. sl., rod. juos blyks. ž. sp."</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Rodyti graf. proc. virš."</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Nuo ger. iki blog.: mėl., žalia, šv. raud., raud."</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Derinti GPU perdangą"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Neleisti HW perdangų"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Komponuojant ekraną visada naudoti GPU"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Įgalinti „OpenGL“ pėdsak."</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Naudotojai ir profiliai"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Pridėti naudotoją ar profilį"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ribotas profilis"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Prieš kuriant apribotą profilį reikės nustatyti ekrano užraktą, kad apsaugotumėte programas ir asmeninius duomenis."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Nustatyti užraktą"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nenustatyta"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Nenustatytas – ribotas profilis"</string>
     <string name="user_owner" msgid="3879126011135546571">"Savininkas"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Slapyvardis"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Pridėti"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Naudotojai turi savo programas ir turinį"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Riboti profiliai gali pasiekti tik programas ir paskyrų turinį"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Galite apriboti prieigą prie paskyros programų ir turinio"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Naudotojas"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ribotas profilis"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Pridėti naują naudotoją"</string>
@@ -1841,28 +1842,24 @@
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Sukūrus naują naudotoją, tas asmuo turi įvykdyti sąrankos procesą."\n\n"Bet kuris naudotojas gali priimti atnaujintų programų leidimus visų kitų naudotojų vardu."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nustatyti naudotoją dabar?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Įsitikinkite, kad asmuo gali naudoti planšetinį kompiuterį ir nustatyti savo vietą"</string>
-    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Nustatyti naudotoją dabar?"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Nustatyti profilį dabar?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Nustatyti dabar"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ne dabar"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Tik planšetinio kompiuterio savininkas gali tvarkyti naudotojus."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Tik telefono savininkas gali tvarkyti naudotojus."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Apribotuose profiliuose negalima pridėti paskyrų"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Ištrinti <xliff:g id="USER_NAME">%1$s</xliff:g> iš šio įr."</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Naujas naudotojas"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Naujas profilis"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Ištrinti save?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Pašalinti naudotoją?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Pašalinti profilį?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Jūsų vieta ir duomenys dings iš šio planšetinio kompiuterio. Šio veiksmo anuliuoti negalima."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Jūsų vieta ir duomenys dings iš šio telefono. Šio veiksmo anuliuoti negalima."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Šio naudotojo vieta ir duomenys dings iš šio planšetinio kompiuterio. Šio veiksmo anuliuoti negalima."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Šio naudotojo vieta ir duomenys dings iš šio telefono. Šio veiksmo anuliuoti negalima."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Šio profilio vieta ir duomenys dings iš šio planšetinio kompiuterio. Šio veiksmo anuliuoti negalima."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Šio profilio vieta ir duomenys dings iš šio telefono. Šio veiksmo anuliuoti negalima."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Programų ir turinio apribojimai"</string>
     <string name="user_rename" msgid="8523499513614655279">"PERVARDYTI"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Nustatyti programų ribas"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontroliuoja „<xliff:g id="APP">%1$s</xliff:g>“"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ši programa nepalaikoma apribotuose profiliuose"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ši programa gali pasiekti jūsų paskyras"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"„Wi‑Fi“ ir mobilusis ryšys"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Leisti keisti „Wi‑Fi“ ir mobiliojo ryšio nustatymus"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 444871e..9ad0e86 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Atrašanās vieta"</item>
     <item msgid="255608127647030286">"Privāti"</item>
     <item msgid="4588829735729884491">"Ziņojumapmaiņa"</item>
-    <item msgid="8971765125227378270">"Ierīce"</item>
+    <item msgid="886742181977884584">"Multivide"</item>
+    <item msgid="7924928667052300589">"Ierīce"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"aptuvena atrašanās vieta"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"atskaņot audio"</item>
     <item msgid="8374996688066472414">"lasīt starpliktuvi"</item>
     <item msgid="3045529469061083747">"modificēt starpliktuvi"</item>
+    <item msgid="5124443975763747838">"multivides pogas"</item>
+    <item msgid="4547883971364273343">"audio uzsvars"</item>
+    <item msgid="2603878814882344450">"galvenais skaļums"</item>
+    <item msgid="7136963238377062018">"balss skaļums"</item>
+    <item msgid="4270236897655923007">"zvana skaļums"</item>
+    <item msgid="6325739889222559394">"multivides skaļums"</item>
+    <item msgid="5762123934816216821">"signāla skaļums"</item>
+    <item msgid="785049718065337473">"paziņojumu skaļums"</item>
+    <item msgid="6700305533746877052">"Bluetooth apjoms"</item>
+    <item msgid="2029227495214047094">"neļaut pāriet miega rež."</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Atrašanās vieta"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Atskaņot audio"</item>
     <item msgid="136815868796597058">"Lasīt starpliktuvi"</item>
     <item msgid="5238692940326972503">"Modificēt starpliktuvi"</item>
+    <item msgid="5753789168376302997">"Multivides pogas"</item>
+    <item msgid="3265262911688671938">"Audio uzsvars"</item>
+    <item msgid="2098976479485046797">"Galvenais skaļums"</item>
+    <item msgid="5660213838861789350">"Balss skaļums"</item>
+    <item msgid="7983336752371254444">"Zvana skaļums"</item>
+    <item msgid="7878027809189330917">"Multivides skaļums"</item>
+    <item msgid="7260546305036218513">"Signāla skaļums"</item>
+    <item msgid="9103719301075748925">"Paziņojumu skaļums"</item>
+    <item msgid="7025966722295861512">"Bluetooth apjoms"</item>
+    <item msgid="4665183401128289653">"Neļaut pāriet miega rež."</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Īss"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Ekrānā kā līnijas"</item>
     <item msgid="120512413928262547">"Komandā “adb shell dumpsys gfxinfo”"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Izslēgta"</item>
+    <item msgid="7688197031296835369">"Rādīt apgab., kur pārsn. kapacitāte"</item>
+    <item msgid="8332661909019981149">"Rādīt kapac. pārsnieguma skaitītāju"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standarta ierobežojums"</item>
     <item msgid="4071574792028999443">"Nav fona procesu"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 77996c8..299e3fa 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ierakstiet bloķēšanas ekrānā parādāmo tekstu"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Bloķēšanas ekrānā rādīt informāciju par lietotāju"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Lietot. informācija"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Rādīt profila informāciju bloķētā ekrānā"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profila informācija"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Piekļuve atrašanās vietai"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Drošība"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Manas atrašanās vietas, ekrāna atbloķēšanas, SIM kartes bloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Pārveidot tīklu"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Lai skatītu pieejamos tīklus, ieslēdziet Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Notiek Wi-Fi tīklu meklēšana…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Jums nav atļaujas mainīt Wi‑Fi tīklu."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Cits tīkls..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Vairāk"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. iestatīšana (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Lai pārsl., nosp. Ctrl + atst. t."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Noklusējums"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastatūras izkārtojumi"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Lietotāja vārdnīca"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personiskā vārdnīca"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personiskās vārdnīcas"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personiskā vārdnīca"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Pievienot"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Pievienot vārdnīcai"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonis"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ietekmē ierunātā teksta toni"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Valoda"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nav atlasīta valoda."</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Runātajam tekstam iestata valodai raksturīgu balsi"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Noklausīties piemēru"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Atskaņot īsu runas sintēzes demonstrāciju"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Atjaunināt logu skat., ja zīm. tiek liet. GPU."</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Rādīt apar. slāņu atjaun."</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Atjaunin. aparatūras slāņiem ir jāmirgo zaļā krāsā"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Rādīt GPU pārsn. apjomu"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Kārtība: zils, zaļš, gaiši sarkans, sarkans"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Atkļūdot graf. proc. kapac. pārsn."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Atspējot HW pārklājumus"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vienmēr izmantot GPU atveidi ekrāna salikšanai"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Iespējot OpenGL trases"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Lietotāji un profili"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Pievienot lietotāju vai profilu"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ierobežots profils"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Lai varētu izveidot ierobežotu profilu, jums jāiestata ekrāna bloķēšana, kas aizsargās jūsu lietotni un personas datus."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Iestatīt bloķēšanu"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nav iestatīts"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Ierobežots profils — nav iestatīts."</string>
     <string name="user_owner" msgid="3879126011135546571">"Īpašnieks"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Segvārds"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Pievienošana"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Lietotājiem ir savas lietotnes un saturs."</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"No ierobežotiem profiliem var piekļūt tikai jūsu kontos esošajām lietotnēm un saturam."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Varat ierobežot piekļuvi lietotnēm un saturam no sava konta."</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Lietotājs"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ierobežots profils"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Lietotāja pievienošana"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Vēlāk"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Lietotājus var pārvaldīt tikai planšetdatora īpašnieks."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Lietotājus var pārvaldīt tikai tālruņa īpašnieks."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ierobežoti profili nevar pievienot kontus."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Dzēst šajā ierīcē: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Jauns lietotājs"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Jauns profils"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vai dzēst jūsu kontu?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Vai noņemt lietotāju?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Vai noņemt profilu?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Jūs zaudēsiet savu vidi un datus šajā planšetdatorā. Šo darbību nevar atsaukt."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Jūs zaudēsiet savu vidi un datus šajā tālrunī. Šo darbību nevar atsaukt."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Šī lietotāja vide un dati tiks noņemti no šī planšetdatora. Šo darbību nevar atsaukt."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Šī lietotāja vide un dati tiks noņemti no šī tālruņa. Šo darbību nevar atsaukt."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Šī profila vide un dati tiks noņemti no šī planšetdatora. Šo darbību nevar atsaukt."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Šī profila vide un dati tiks noņemti no šī tālruņa. Šo darbību nevar atsaukt."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Lietotņu un satura ierobežojumi"</string>
     <string name="user_rename" msgid="8523499513614655279">"PĀRDĒVĒT"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Iestatīt lietotņu ierobežojumus"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Pārvalda lietotne <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ierobežotiem profiliem netiek atbalstīta šī lietotne."</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Šī lietotne var piekļūt jūsu kontiem."</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi un mobilais tīkls"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Atļaut Wi‑Fi un mobilā tīkla iestatījumu pārveidošanu"</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 82d4837..5dc09b5 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Lokasi"</item>
     <item msgid="255608127647030286">"Peribadi"</item>
     <item msgid="4588829735729884491">"Pemesejan"</item>
-    <item msgid="8971765125227378270">"Peranti"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Peranti"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"lokasi kasar"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"mainkan audio"</item>
     <item msgid="8374996688066472414">"baca papan keratan"</item>
     <item msgid="3045529469061083747">"ubah suai papan keratan"</item>
+    <item msgid="5124443975763747838">"butang media"</item>
+    <item msgid="4547883971364273343">"tumpuan audio"</item>
+    <item msgid="2603878814882344450">"kelantangan induk"</item>
+    <item msgid="7136963238377062018">"kelantangan suara"</item>
+    <item msgid="4270236897655923007">"kelantangan deringan"</item>
+    <item msgid="6325739889222559394">"kelantangan media"</item>
+    <item msgid="5762123934816216821">"kelantangan penggera"</item>
+    <item msgid="785049718065337473">"kelantangan pemberitahuan"</item>
+    <item msgid="6700305533746877052">"kelantangan bluetooth"</item>
+    <item msgid="2029227495214047094">"kekal berjaga"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokasi"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Mainkan audio"</item>
     <item msgid="136815868796597058">"Baca papan keratan"</item>
     <item msgid="5238692940326972503">"Ubah suai papan keratan"</item>
+    <item msgid="5753789168376302997">"Butang media"</item>
+    <item msgid="3265262911688671938">"Tumpuan audio"</item>
+    <item msgid="2098976479485046797">"Kelantangan utama"</item>
+    <item msgid="5660213838861789350">"Kelantangan suara"</item>
+    <item msgid="7983336752371254444">"Kelantangan deringan"</item>
+    <item msgid="7878027809189330917">"Kelantangan media"</item>
+    <item msgid="7260546305036218513">"Kelantangan penggera"</item>
+    <item msgid="9103719301075748925">"Kelantangan pemberitahuan"</item>
+    <item msgid="7025966722295861512">"Kelantangan Bluetooth"</item>
+    <item msgid="4665183401128289653">"Kekal berjaga"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Pendek"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Pada skrin sebagai garis"</item>
     <item msgid="120512413928262547">"Dalam adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Mati"</item>
+    <item msgid="7688197031296835369">"Tunjukkan kawasan lebih lukis"</item>
+    <item msgid="8332661909019981149">"Tunjukkan kaunter lebih lukis"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Had standard"</item>
     <item msgid="4071574792028999443">"Tiada proses latar belakang"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 00b902c..ca13976 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Taip teks untuk dipaparkan pada skrin kunci"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Tunjukkan maklumat pengguna pada skrin kunci"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Maklumat pengguna"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Tunjukkan maklumat profil pada skrin kunci"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Maklumat profil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Akses lokasi"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Keselamatan"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Tetapkan Lokasi Saya, buka kunci skrin, kunci kad SIM, kunci storan bukti kelayakan"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah suai"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Untuk melihat rangkaian yang tersedia, hidupkan Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Mencari rangkaian Wi-Fi..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Anda tiada kebenaran untuk menukar rangkaian Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Rangkaian lain..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lagi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Persediaan automatik (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Untuk bertukar, tekan Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Lalai"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Susun atur papan kekunci"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamus pengguna"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamus peribadi"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Kamus peribadi"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Kamus peribadi"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Tambah"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Tambah ke kamus"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pic"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mempengaruhi nada teks pertuturan"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Bahasa"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Bahasa tidak dipilih"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Menetapkan suara khusus bahasa untuk teks pertuturan"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Dengar contoh"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Mainkan tunjuk cara singkat sintesis pertuturan"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Denyar pandangan dlm tetingkap yg dilukis dgn GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Menunjukkan lapisan kemas kini perkakasan"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Pancar hijau lapisan perkakasan yg dikemas kini"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Tunjukkan had lebih GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Terbaik -&gt; terburuk: biru, hijau, merah muda, merah"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Nyahpepijat lebih lukis GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Lumpuhkan tindihan atas HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Sentiasa gunakan GPU untuk komposit skrin"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Dayakan kesan OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Pengguna &amp; profil"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Tambah pengguna atau profil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil terhad"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Sebelum anda boleh membuat profil yang terhad, anda perlu menyediakan kunci skrin untuk melindungi apl dan data peribadi anda."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Tetapkan kunci"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Tidak disediakan"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Tidak disediakan - Profil terhad"</string>
     <string name="user_owner" msgid="3879126011135546571">"Pemilik"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Nama samaran"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Tambah"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Pengguna mempunyai apl dan kandungan mereka sendiri"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Profil terhad hanya boleh mengakses apl dan kandungan dari akaun anda"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Anda boleh menyekat akses kepada apl dan kandungan dari akaun anda"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Pengguna"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil terhad"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Tambah pengguna baharu"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Bukan sekarang"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Hanya pemilik tablet boleh menguruskan pengguna."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Hanya pemilik telefon boleh menguruskan pengguna."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profil yang disekat tidak boleh menambah akaun"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Padam <xliff:g id="USER_NAME">%1$s</xliff:g> dari peranti"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Pengguna baharu"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Profil baharu"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Padam diri anda sendiri?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Alih keluar pengguna?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Alih keluar profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Anda akan kehilangan ruang dan data anda pada tablet ini. Anda tidak boleh membuat asal tindakan ini."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Anda akan kehilangan ruang dan data anda pada telefon ini. Anda tidak boleh membuat asal tindakan ini."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Ruang dan data pengguna ini akan hilang dari tablet ini. Anda tidak boleh membuat asal tindakan ini."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Ruang dan data pengguna ini akan hilang dari telefon ini. Anda tidak boleh membuat asal tindakan ini."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Ruang dan data profil ini akan hilang dari tablet ini. Anda tidak boleh membuat asal tindakan ini."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Ruang dan data profil ini akan hilang dari telefon ini. Anda tidak boleh membuat asal tindakan ini."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Sekatan aplikasi dan kandungan"</string>
     <string name="user_rename" msgid="8523499513614655279">"NAMAKAN SEMULA"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Tetapkan had aplikasi"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Dikawal oleh <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Apl ini tidak disokong dalam profil yang disekat"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Apl ini boleh mengakses akaun anda"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi dan Mudah Alih"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Benarkan pengubahsuaian tetapan Wi-Fi dan Mudah Alih"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 0a2c15e..20d36b3 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Posisjon"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Meldinger"</item>
-    <item msgid="8971765125227378270">"Enhet"</item>
+    <item msgid="886742181977884584">"Medier"</item>
+    <item msgid="7924928667052300589">"Enhet"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"anslått posisjon"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"spill av lyd"</item>
     <item msgid="8374996688066472414">"lesing av utklippstavlen"</item>
     <item msgid="3045529469061083747">"endring av utklippstavlen"</item>
+    <item msgid="5124443975763747838">"medieknapper"</item>
+    <item msgid="4547883971364273343">"audiofokus"</item>
+    <item msgid="2603878814882344450">"hovedvolum"</item>
+    <item msgid="7136963238377062018">"stemmevolum"</item>
+    <item msgid="4270236897655923007">"ringevolum"</item>
+    <item msgid="6325739889222559394">"medievolum"</item>
+    <item msgid="5762123934816216821">"alarmvolum"</item>
+    <item msgid="785049718065337473">"varselvolum"</item>
+    <item msgid="6700305533746877052">"bluetooth-volum"</item>
+    <item msgid="2029227495214047094">"hold aktiv"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Sted"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Spill av lyd"</item>
     <item msgid="136815868796597058">"Lesing av utklippstavlen"</item>
     <item msgid="5238692940326972503">"Endring av utklippstavlen"</item>
+    <item msgid="5753789168376302997">"Medieknapper"</item>
+    <item msgid="3265262911688671938">"Audiofokus"</item>
+    <item msgid="2098976479485046797">"Hovedvolum"</item>
+    <item msgid="5660213838861789350">"Stemmevolum"</item>
+    <item msgid="7983336752371254444">"Ringevolum"</item>
+    <item msgid="7878027809189330917">"Medievolum"</item>
+    <item msgid="7260546305036218513">"Alarmvolum"</item>
+    <item msgid="9103719301075748925">"Varselvolum"</item>
+    <item msgid="7025966722295861512">"Bluetooth-volum"</item>
+    <item msgid="4665183401128289653">"Hold aktiv"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"På skjermen som linjer"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Av"</item>
+    <item msgid="7688197031296835369">"Vis overtrekksområder"</item>
+    <item msgid="8332661909019981149">"Vis overtrekksteller"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standard grense"</item>
     <item msgid="4071574792028999443">"Ingen bakgrunnsprosesser"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 15dbd4d..e6ce0a5 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Skriv inn teksten som skal vises på låseskjermen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Vis brukerinformasjon på låseskjermen"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Brukerinformasjon"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Vis profilinformasjon på låseskjermen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profilinformasjon"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Posisjonstilgang"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sikkerhet"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Posisjon, skjermlås, SIM-kort-lås"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Endre nettverk"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Hvis du vil se tilgj. nettverk, slår du på Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Søker etter Wi-Fi-nettverk ..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Du har ikke tillatelse til å endre Wi-Fi-nettverk."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Annet nettverk"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Se mer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Bytt ved å trykke på Ctrl+Mellomromstasten"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastaturoppsett"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Ordliste"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personlig ordbok"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personlige ordbøker"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personlig ordliste"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Legg til"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Legg til ordliste"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Stemmeleie"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Endrer tonehøyden teksten sies med"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Språk"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Språk er ikke valgt"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Velger språkspesifikk stemme"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Lytt til et eksempel"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Spill en kort demonstrasjon av talesyntesen"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Fremhev visninger i vinduer når tegnet med GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Vis opp. for mask.varelag"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"La maskinvarelag blinke i grønt når oppdatert"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Se GPU-overforbruk"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Fra best til verst: blå, grønn, lyserød, rød"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Feilsøk GPU-overtrekk"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Deaktiver HW-overlegg"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Bruk alltid GPU for skjermsammensetting"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktiver OpenGL-spor"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Brukere og profiler"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Legg til en bruker eller profil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Begrenset profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Før du kan opprette en begrenset profil, må du konfigurere skjermlåsen for å beskytte appene og de personlige dataene dine."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Angi lås"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ikke konfigurert"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Ikke konfigurert – begrenset profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Eier"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Kallenavn"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Legg til"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Brukere har sine egne apper og eget innhold"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Begrensede profiler kan bare bruke appene og innholdet fra kontoene dine"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Du kan begrense tilgangen til apper og innhold fra kontoen din"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Bruker"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begrenset profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Legg til ny bruker"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ikke nå"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Bare eieren av nettbrettet kan administrere brukere."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Bare eieren av telefonen kan administrere brukere."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Begrensede profiler kan ikke legge til kontoer"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Slett <xliff:g id="USER_NAME">%1$s</xliff:g> fra denne enheten"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Ny bruker"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Ny profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vil du slette deg selv?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Vil du slette brukeren?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Vil du fjerne profilen?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Lagringsplassen og dataene dine blir fjernet fra dette nettbrettet. Denne handlingen kan ikke angres."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Lagringsplassen og dataene dine blir fjernet fra telefonen. Denne handlingen kan ikke angres."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Lagringsplassen og dataene for brukeren blir fjernet fra nettbrettet. Denne handlingen kan ikke angres."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Lagringsplassen og dataene for brukeren blir fjernet fra telefonen. Denne handlingen kan ikke angres."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Lagringsplassen og dataene for profilen blir fjernet fra nettbrettet. Denne handlingen kan ikke angres."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Lagringsplassen og dataene for profilen blir fjernet fra telefonen. Denne handlingen kan ikke angres."</string>
     <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>
@@ -1879,13 +1876,12 @@
     <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_restrictions_title" msgid="7745810037152772035">"Begrensninger for apper og innhold"</string>
     <string name="user_rename" msgid="8523499513614655279">"GI NYTT NAVN"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Angi appbegrensninger"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontrollert av <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
-    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Denne appen kan bruke kontoene dine"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Denne appen støttes ikke i begrensede profiler"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Denne appen har tilgang til kontoene dine"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi og mobil"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Tillat endring av Wi-Fi- og mobilinnstillinger"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 320a2a1..f1f9fa9 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Locatie"</item>
     <item msgid="255608127647030286">"Persoonlijk"</item>
     <item msgid="4588829735729884491">"Berichten"</item>
-    <item msgid="8971765125227378270">"Apparaat"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Apparaat"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"geschatte locatie"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"audio afspelen"</item>
     <item msgid="8374996688066472414">"klembord lezen"</item>
     <item msgid="3045529469061083747">"klembord aanpassen"</item>
+    <item msgid="5124443975763747838">"mediaknoppen"</item>
+    <item msgid="4547883971364273343">"audiofocus"</item>
+    <item msgid="2603878814882344450">"hoofdvolume"</item>
+    <item msgid="7136963238377062018">"stemvolume"</item>
+    <item msgid="4270236897655923007">"beltoonvolume"</item>
+    <item msgid="6325739889222559394">"mediavolume"</item>
+    <item msgid="5762123934816216821">"alarmvolume"</item>
+    <item msgid="785049718065337473">"meldingsvolume"</item>
+    <item msgid="6700305533746877052">"bluetooth-volume"</item>
+    <item msgid="2029227495214047094">"ingeschakeld houden"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Locatie"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Audio afspelen"</item>
     <item msgid="136815868796597058">"Klembord lezen"</item>
     <item msgid="5238692940326972503">"Klembord aanpassen"</item>
+    <item msgid="5753789168376302997">"Mediaknoppen"</item>
+    <item msgid="3265262911688671938">"Audiofocus"</item>
+    <item msgid="2098976479485046797">"Hoofdvolume"</item>
+    <item msgid="5660213838861789350">"Stemvolume"</item>
+    <item msgid="7983336752371254444">"Beltoonvolume"</item>
+    <item msgid="7878027809189330917">"Mediavolume"</item>
+    <item msgid="7260546305036218513">"Alarmvolume"</item>
+    <item msgid="9103719301075748925">"Meldingsvolume"</item>
+    <item msgid="7025966722295861512">"Bluetooth-volume"</item>
+    <item msgid="4665183401128289653">"Ingeschakeld houden"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Op het scherm als lijnen"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Uit"</item>
+    <item msgid="7688197031296835369">"Gedeeltes met overbelasting weergeven"</item>
+    <item msgid="8332661909019981149">"Teller voor overbelasting weergeven"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen achtergrondprocessen"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7ec82f1..702d5aa 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Typ tekst voor weergave op vergrendeld scherm"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Gebruikersgegevens weergeven op vergrendeld scherm"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Gebruikersgegevens"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Profielinfo weergeven op vergrendelingsscherm"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profielinfo"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Locatietoegang"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Beveiliging"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Mijn locatie\', schermontgrendeling, SIM- en referentieopslagvergrendeling instellen"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netwerk aanpassen"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Schakel wifi in om beschikbare netwerken te zien."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wifi-netwerken zoeken…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"U heeft geen toestemming om het wifi-netwerk te wijzigen."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Ander netwerk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Meer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. config. (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Druk op Ctrl-spatiebalk om te schakelen"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standaard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Toetsenbordindelingen"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Gebruikerswoordenboek"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Persoonlijk woordenboek"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Persoonlijke woordenboeken"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Persoonlijk woordenboek"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Toevoegen"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Toevoegen aan woordenboek"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Hoogte"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Is van invloed op de toon van de gesproken tekst"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Taal"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Taal niet geselecteerd"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"De taalspecifieke stem voor de gesproken tekst instellen"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Luisteren naar een voorbeeld"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Een korte demonstratie van spraaksynthese afspelen"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash-weergaven in vensters indien getekend met de GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Updaten hardwarelgn wrgvn"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Hardwarelagen knipperen groen bij updates"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Overbelasting GPU tonen"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Best naar slechtst: blauw, groen, lichtrood, rood"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Foutopsporing GPU-overbelasting"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW-overlays uitschakelen"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"GPU altijd gebruiken voor schermcompositing"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL-sporen inschakelen"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Gebruikers en profielen"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Gebruiker of profiel toevoegen"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Beperkt profiel"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Voordat u een beperkt profiel kunt maken, moet u een schermvergrendeling instellen om uw apps en persoonlijke gegevens te beschermen."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Vergrendeling instellen"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Niet ingesteld"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Niet ingesteld - Beperkt profiel"</string>
     <string name="user_owner" msgid="3879126011135546571">"Eigenaar"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Bijnaam"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Toevoegen"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Gebruikers hebben hun eigen apps en inhoud"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Beperkte profielen kunnen alleen de apps en inhoud uit uw accounts gebruiken"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"U kunt toegang tot apps en inhoud vanuit uw account beperken"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Gebruiker"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Beperkt profiel"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Nieuwe gebruiker toevoegen"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Niet nu"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Alleen de eigenaar van de tablet kan gebruikers beheren."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Alleen de eigenaar van de telefoon kan gebruikers beheren."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Beperkte profielen kunnen geen accounts toevoegen"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> verwijderen van dit apparaat"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nieuwe gebruiker"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nieuw profiel"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Wilt u uzelf verwijderen?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Gebruiker verwijderen?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Profiel verwijderen?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"U raakt uw opslagruimte en gegevens op deze tablet kwijt. U kunt deze actie niet ongedaan maken."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"U raakt uw opslagruimte en gegevens op deze telefoon kwijt. U kunt deze actie niet ongedaan maken."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"De opslagruimte en gegevens van deze gebruiker verdwijnen van deze tablet. U kunt deze actie niet ongedaan maken."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"De opslagruimte en gegevens van deze gebruiker verdwijnen van deze telefoon. U kunt deze actie niet ongedaan maken."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"De opslagruimte en gegevens van dit profiel verdwijnen van deze tablet. U kunt deze actie niet ongedaan maken."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"De opslagruimte en gegevens van dit profiel verdwijnen van deze telefoon. U kunt deze actie niet ongedaan maken."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Beperkingen voor apps en inhoud"</string>
     <string name="user_rename" msgid="8523499513614655279">"NAAM WIJZIGEN"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"App-limieten instellen"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Beheerd door <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Deze app wordt niet ondersteund voor beperkte profielen"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Deze app heeft toegang tot uw accounts"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wifi en mobiel"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Aanpassing van mobiele en wifi-instellingen toestaan"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index babcad6..b0050a9 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Lokalizacja"</item>
     <item msgid="255608127647030286">"Osobiste"</item>
     <item msgid="4588829735729884491">"Wiadomości"</item>
-    <item msgid="8971765125227378270">"Urządzenie"</item>
+    <item msgid="886742181977884584">"Multimedia"</item>
+    <item msgid="7924928667052300589">"Urządzenie"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"przybliżona lokalizacja"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"odtwórz dźwięk"</item>
     <item msgid="8374996688066472414">"czytaj schowek"</item>
     <item msgid="3045529469061083747">"modyfikuj schowek"</item>
+    <item msgid="5124443975763747838">"przyciski multimediów"</item>
+    <item msgid="4547883971364273343">"aktywność audio"</item>
+    <item msgid="2603878814882344450">"głośność główna"</item>
+    <item msgid="7136963238377062018">"głośność mowy"</item>
+    <item msgid="4270236897655923007">"głośność dzwonka"</item>
+    <item msgid="6325739889222559394">"głośność multimediów"</item>
+    <item msgid="5762123934816216821">"głośność alarmu"</item>
+    <item msgid="785049718065337473">"głośność powiadomień"</item>
+    <item msgid="6700305533746877052">"głośność Bluetooth"</item>
+    <item msgid="2029227495214047094">"utrzymanie aktywności"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokalizacja"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Odtwórz dźwięk"</item>
     <item msgid="136815868796597058">"Czytaj schowek"</item>
     <item msgid="5238692940326972503">"Modyfikuj schowek"</item>
+    <item msgid="5753789168376302997">"Przyciski multimediów"</item>
+    <item msgid="3265262911688671938">"Aktywność audio"</item>
+    <item msgid="2098976479485046797">"Głośność główna"</item>
+    <item msgid="5660213838861789350">"Głośność mowy"</item>
+    <item msgid="7983336752371254444">"Głośność dzwonka"</item>
+    <item msgid="7878027809189330917">"Głośność multimediów"</item>
+    <item msgid="7260546305036218513">"Głośność alarmu"</item>
+    <item msgid="9103719301075748925">"Głośność powiadomień"</item>
+    <item msgid="7025966722295861512">"Głośność Bluetooth"</item>
+    <item msgid="4665183401128289653">"Utrzymanie aktywności"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krótkie"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Na ekranie w postaci linii"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Wył."</item>
+    <item msgid="7688197031296835369">"Pokaż przerysowywane obszary"</item>
+    <item msgid="8332661909019981149">"Pokaż licznik przerysowań"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardowy limit"</item>
     <item msgid="4071574792028999443">"Brak procesów w tle"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4d4358a..ad98a80 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Wpisz tekst do wyświetlenia na ekranie blokady."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Pokaż informacje o użytkowniku na zablokowanym ekranie"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Użytkownik – informacje"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Pokaż informacje o profilu na ekranie blokady"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informacje o profilu"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Dostęp do lokalizacji"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Zabezpieczenia"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modyfikuj sieć"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Aby zobaczyć dostępne sieci, włącz Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wyszukuję sieci Wi-Fi…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nie masz uprawnień do zmiany sieci Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Inna sieć…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Więcej"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autokonfiguracja (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Control-spacja, by przełączyć"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Domyślna"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Układy klawiatury"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Słownik użytkownika"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Słownik osobisty"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobiste słowniki"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Słownik osobisty"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Dodaj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Dodaj do słownika"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tony"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Określa ton czytanego tekstu"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Język"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nie wybrano języka"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ustawia zależny od języka głos dla czytanych tekstów"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Posłuchaj przykładu"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Odtwórz krótką prezentację syntezy mowy"</string>
@@ -1541,7 +1541,7 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Autoprzywracanie"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Przy ponownej instalacji aplikacji przywróć ustawienia i dane z kopii zapasowej."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Hasło kopii zapasowych"</string>
-    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Pełne kopie zapasowe na komputerze nie są obecnie chronione."</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Pełne kopie zapasowe na komputerze nie są obecnie chronione"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Wybierz, aby zmienić lub usunąć hasło pełnych kopii zapasowych na komputerze stacjonarnym."</string>
     <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nowe hasło kopii zapasowej zostało ustawione"</string>
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Nowe hasło i jego potwierdzenie nie zgadzają się"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Podświetlaj elementy w oknach jeśli są rysowane przez GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Pokaż zmiany warstw sprzęt."</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Oznaczaj aktualizowane warstwy sprzętowe na zielono"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Pokaż przeciągnięcie GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Najlepszy-najg.: nieb., ziel., jasnoczerw., czerw."</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Debuguj przerysowania GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Wyłącz nakładki HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Zawsze używaj GPU do komponowania ekranu"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Włącz śledzenia OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Użytkownicy i profile"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Dodaj użytkownika lub profil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil ograniczony"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Zanim utworzysz profil z ograniczeniami, musisz skonfigurować ekran blokady, by chronić aplikacje i osobiste dane."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Ustaw blokadę"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nieskonfigurowany"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Nieskonfigurowany profil ograniczony"</string>
     <string name="user_owner" msgid="3879126011135546571">"Właściciel"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Pseudonim"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Dodaj"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Użytkownicy mają własne aplikacje i treści"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Profile ograniczone mogą korzystać tylko z aplikacji i treści na Twoich kontach"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Możesz ograniczyć dostęp do aplikacji i zawartości z poziomu swojego konta"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Użytkownik"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil ograniczony"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj nowego użytkownika"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nie teraz"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Użytkownikami może zarządzać tylko właściciel tabletu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Użytkownikami może zarządzać tylko właściciel telefonu."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profile z ograniczeniami nie mogą dodawać kont"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Usuń użytkownika <xliff:g id="USER_NAME">%1$s</xliff:g> z tego urządzenia"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nowy użytkownik"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nowy profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Chcesz usunąć siebie?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Usunąć użytkownika?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Usunąć profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Utracisz swój obszar i dane na tym tablecie. Tej czynności nie można cofnąć."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Utracisz swój obszar i dane na tym telefonie. Tej czynności nie można cofnąć."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Obszar i dane tego użytkownika znikną z tabletu. Tej czynności nie można cofnąć."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Obszar i dane tego użytkownika znikną z telefonu. Tej czynności nie można cofnąć."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Obszar i dane tego profilu znikną z tabletu. Tej czynności nie można cofnąć."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Obszar i dane tego profilu znikną z telefonu. Tej czynności nie można cofnąć."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Ograniczenia aplikacji i zawartości"</string>
     <string name="user_rename" msgid="8523499513614655279">"ZMIEŃ NAZWĘ"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Ustaw ograniczenia aplikacji"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontrolowane przez <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ta aplikacja nie jest obsługiwana w profilach z ograniczeniami"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ta aplikacja może uzyskać dostęp do Twoich kont"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Sieć Wi‑Fi i komórkowa"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Zezwalaj na modyfikowanie ustawień sieci Wi‑Fi i komórkowej"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 267fe34..d765c4e 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Local"</item>
     <item msgid="255608127647030286">"Pessoal"</item>
     <item msgid="4588829735729884491">"Mensagens"</item>
-    <item msgid="8971765125227378270">"Dispositivo"</item>
+    <item msgid="886742181977884584">"Multimédia"</item>
+    <item msgid="7924928667052300589">"Dispositivo"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"localização aproximada"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"reproduzir áudio"</item>
     <item msgid="8374996688066472414">"ler área de transferência"</item>
     <item msgid="3045529469061083747">"modificar área de transferência"</item>
+    <item msgid="5124443975763747838">"botões multimédia"</item>
+    <item msgid="4547883971364273343">"orientação do áudio"</item>
+    <item msgid="2603878814882344450">"volume principal"</item>
+    <item msgid="7136963238377062018">"volume de voz"</item>
+    <item msgid="4270236897655923007">"volume de toque"</item>
+    <item msgid="6325739889222559394">"volume de multimédia"</item>
+    <item msgid="5762123934816216821">"volume de alarme"</item>
+    <item msgid="785049718065337473">"volume de notificação"</item>
+    <item msgid="6700305533746877052">"volume de Bluetooth"</item>
+    <item msgid="2029227495214047094">"Manter ativo"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Localização"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Reproduzir áudio"</item>
     <item msgid="136815868796597058">"Ler área de transferência"</item>
     <item msgid="5238692940326972503">"Modificar área de transferência"</item>
+    <item msgid="5753789168376302997">"Botões multimédia"</item>
+    <item msgid="3265262911688671938">"Orientação do áudio"</item>
+    <item msgid="2098976479485046797">"Volume principal"</item>
+    <item msgid="5660213838861789350">"Volume da voz"</item>
+    <item msgid="7983336752371254444">"Volume do toque"</item>
+    <item msgid="7878027809189330917">"Volume de multimédia"</item>
+    <item msgid="7260546305036218513">"Volume do alarme"</item>
+    <item msgid="9103719301075748925">"Volume de notificações"</item>
+    <item msgid="7025966722295861512">"Volume de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Manter ativo"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curta"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"No ecrã como linhas"</item>
     <item msgid="120512413928262547">"Em adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Desativado"</item>
+    <item msgid="7688197031296835369">"Mostrar áreas de sobreposição"</item>
+    <item msgid="8332661909019981149">"Mostrar contador de sobreposições"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite padrão"</item>
     <item msgid="4071574792028999443">"Sem processos em segundo plano"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9600266..2996ea8 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Introduzir texto a apresentar no ecrã de bloqueio"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar info. utilizador no ecrã de bloqueio"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Info. utilizador"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar informação do perfil no ecrã de bloqueio"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informação do perfil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Acesso à localização"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Segurança"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para ver as redes disponíveis, ligue o Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"A pesquisar redes Wi-Fi..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Não tem autorização para alterar a rede Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Outra rede..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automática (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para alternar, prima Ctrl-Bar. esp."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predefinição"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Esquemas de teclado"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicionário do utilizador"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicionário pessoal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dicionários pessoais"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dicionário pessoal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Adicionar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Adicionar ao dicionário"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonalidade"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta o tom do texto falado"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma não selecionado"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Define a voz do idioma específico para o texto lido"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ouvir um exemplo"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduzir uma breve demonstração de síntese de voz"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Dest. visualiz. em janelas quando desenh. c/ GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Mostrar atual. cam. hard."</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Camadas de hard. flash verdes quando estão atuali."</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Mostrar GPU excedente"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Melhor para pior: azul, verde, verm. claro, verm."</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Depurar sobreposição GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desativ. sobreposições HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizar sempre GPU para a composição do ecrã"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ativar vestígios OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Utilizadores e perfis"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Adicionar utilizador ou perfil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restrito"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Antes de poder criar um perfil restrito, tem de configurar um bloqueio de ecrã para proteger as suas aplicações e dados pessoais."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Definir bloqueio"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Não configurado"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Não configurado – Perfil restrito"</string>
     <string name="user_owner" msgid="3879126011135546571">"Proprietário"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Pseudónimo"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Adicionar"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Os utilizadores têm as suas próprias aplicações e conteúdos"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Os perfis restritos só podem aceder às aplicações e conteúdos das suas contas"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Pode restringir o acesso às aplicações e conteúdos da sua conta"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilizador"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restrito"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Adicionar novo utilizador"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Agora não"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"A gestão dos utilizadores só pode ser feita pelo proprietário do tablet."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"A gestão dos utilizadores só pode ser feita pelo proprietário do telemóvel."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Os perfis restritos não podem adicionar contas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eliminar <xliff:g id="USER_NAME">%1$s</xliff:g> deste dispositivo"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novo utilizador"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novo perfil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Eliminar-se a si próprio?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Remover utilizador?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Remover perfil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Perderá os dados e espaço neste tablet. Não é possível anular esta ação."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Perderá os dados e espaço neste telemóvel. Não é possível anular esta ação."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Os dados e espaço deste utilizador desaparecerão deste tablet. Não é possível anular esta ação."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Os dados e espaço deste utilizador desaparecerão deste telemóvel. Não é possível anular esta ação."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Os dados e o espaço deste perfil serão removidos deste tablet. Não é possível anular esta ação."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Os dados e o espaço deste perfil serão removidos deste telemóvel. Não é possível anular esta ação."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Restrições à aplicação e conteúdo"</string>
     <string name="user_rename" msgid="8523499513614655279">"MUDAR NOME"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Definir limites da aplicação"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlado por <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Esta aplicação não é suportada nos perfis restritos"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Esta aplicação pode aceder às suas contas"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi e Rede de Telemóvel"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Permitir a modificação de definições de Wi-Fi e de Rede de Telemóvel"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 684b86b..207d4c8 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Local"</item>
     <item msgid="255608127647030286">"Pessoal"</item>
     <item msgid="4588829735729884491">"Mensagens"</item>
-    <item msgid="8971765125227378270">"Dispositivo"</item>
+    <item msgid="886742181977884584">"Mídia"</item>
+    <item msgid="7924928667052300589">"Dispositivo"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"localização aproximada"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"reproduzir áudio"</item>
     <item msgid="8374996688066472414">"ler a área de transferência"</item>
     <item msgid="3045529469061083747">"modificar a área de transferência"</item>
+    <item msgid="5124443975763747838">"botões de mídia"</item>
+    <item msgid="4547883971364273343">"foco de áudio"</item>
+    <item msgid="2603878814882344450">"volume mestre"</item>
+    <item msgid="7136963238377062018">"volume da voz"</item>
+    <item msgid="4270236897655923007">"volume do toque"</item>
+    <item msgid="6325739889222559394">"volume da mídia"</item>
+    <item msgid="5762123934816216821">"volume do alarme"</item>
+    <item msgid="785049718065337473">"volume da notificação"</item>
+    <item msgid="6700305533746877052">"volume do Bluetooth"</item>
+    <item msgid="2029227495214047094">"permanecer ativo"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Local"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Reproduzir áudio"</item>
     <item msgid="136815868796597058">"Ler a área de transferência"</item>
     <item msgid="5238692940326972503">"Modificar a área de transferência"</item>
+    <item msgid="5753789168376302997">"Botões de mídia"</item>
+    <item msgid="3265262911688671938">"Foco de áudio"</item>
+    <item msgid="2098976479485046797">"Volume mestre"</item>
+    <item msgid="5660213838861789350">"Volume da voz"</item>
+    <item msgid="7983336752371254444">"Volume do toque"</item>
+    <item msgid="7878027809189330917">"Volume da mídia"</item>
+    <item msgid="7260546305036218513">"Volume do alarme"</item>
+    <item msgid="9103719301075748925">"Volume da notificação"</item>
+    <item msgid="7025966722295861512">"Volume do Bluetooth"</item>
+    <item msgid="4665183401128289653">"Permanecer ativo"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curto"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Na tela em linhas"</item>
     <item msgid="120512413928262547">"Em adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Desativado"</item>
+    <item msgid="7688197031296835369">"Mostrar áreas de overdraw"</item>
+    <item msgid="8332661909019981149">"Mostrar contador de overdraw"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite padrão"</item>
     <item msgid="4071574792028999443">"Sem processos em segundo plano"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a498739..ad15ed6 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -265,7 +265,7 @@
     <string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Config."</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atalho para as configurações"</string>
-    <string name="airplane_mode" msgid="8837269988154128601">"Modo para avião"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"Modo avião"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Mais..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes sem fio e outras"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Gerenciar Wi-Fi, Bluetooth, modo avião, redes móveis e VPNs"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Digite o texto a ser exibido na tela de bloqueio"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar informações do usuário ao bloquear a tela"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Dados do usuário"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar informações do perfil na tela de bloqueio"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informação do perfil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Acesso ao local"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Segurança"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para ver as redes disponíveis, ative o Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Procurando redes Wi-Fi..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Você não tem permissão para alterar a rede Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Outra rede..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuração automática (WPS)"</string>
@@ -866,7 +867,7 @@
     <string name="storage_title_usb" msgid="679612779321689418">"Conexão USB do computador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectar-se como"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo de mídia (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"Permite a transferência de arquivos de mídia no Windows ou por meio do Android File Transfer no Mac. Consulte www.android.com.br/filetransfer."</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Permite a transferência de arquivos de mídia no Windows ou por meio do Android File Transfer no Mac. Consulte www.android.com/filetransfer."</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Câmera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Permite a transferência de fotos usando o software da câmera e transfere todos os arquivos em computadores que não suportam MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalar ferramentas de transferência de arquivos"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para alterar, pressione Ctrl+espaço"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Padrão"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Layouts de teclado"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicionário do usuário"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicionário pessoal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dicionários pessoais"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dicionário pessoal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Adicionar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Adicionar ao dicionário"</string>
@@ -1293,7 +1292,7 @@
     <string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuração quando o USB estiver conectado"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Revogar autorizações de depuração USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Relatórios de bugs no menu do botão de ligar"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Relat. de bugs menu do b. ligar"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir a opção de obter um relatório de bugs no menu do botão de ligar"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Permanecer ativo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"A tela nunca entrará em inatividade enquanto estiver carregando."</string>
@@ -1417,7 +1416,7 @@
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateria usada quando o tablet está ocioso"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Bateria usada quando o telefone está ocioso"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Bateria usada por rádio celular"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"Alternar para o modo para avião para economizar energia nas áreas sem cobertura celular"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Alternar para o modo avião para economizar energia nas áreas sem cobertura celular"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Bateria usada pela tela e pela luz de fundo"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Reduzir o brilho e/ou o tempo limite da tela"</string>
     <string name="battery_desc_wifi" msgid="2375567464707394131">"Bateria usada por Wi-Fi"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Frequência do som"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afeta o tom do texto falado"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma não selecionado"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Define a voz específica do idioma para o texto falado"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ouça um exemplo"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduzir uma rápida demonstração da voz sintetizada"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Piscar visualizações em janelas ao desenhar c/GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Atual. camad. de hardware"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Piscar camadas de hardware em verde ao atualizar"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Mostrar overdraw da CPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Melhor p/ pior: azul, verde, verm. claro, vermelho"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Depurar overdraw da GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desativar sobreposição HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Sempre usar a GPU para composição de tela"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ativar rastream. OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Usuários e perfis"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Adicionar usuário ou perfil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restrito"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Antes de criar um perfil restrito, configure um bloqueio de tela para proteger seus aplicativos e seus dados pessoais."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Definir bloqueio"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Não configurado"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Não configurado - perfil restrito"</string>
     <string name="user_owner" msgid="3879126011135546571">"Proprietário"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Apelido"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Adicionar"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Usuários padrão têm seus próprios aplicativos e conteúdo"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Perfis restritos podem acessar somente os aplicativos e o conteúdo de suas contas"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"É possível restringir o acesso a aplicativos e conteúdo a partir de sua conta"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuário"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restrito"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Adicionar novo usuário"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Agora não"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Somente o proprietário do tablet pode gerenciar os usuários."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Somente o proprietário do telefone pode gerenciar os usuários."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Perfis restritos não podem adicionar contas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Excluir <xliff:g id="USER_NAME">%1$s</xliff:g> do dispositivo"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novo usuário"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novo perfil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Excluir a si mesmo?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Remover usuário?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Remover perfil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Você perderá seu espaço e seus dados no tablet. Não é possível desfazer esta ação."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Você perderá seu espaço e seus dados no telefone. Não é possível desfazer esta ação."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"O espaço e os dados do usuário desaparecerão do tablet. Não é possível desfazer esta ação."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"O espaço e os dados do usuário desaparecerão do telefone. Não é possível desfazer esta ação."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"O espaço e os dados do perfil desaparecerão do tablet. Não é possível desfazer esta ação."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"O espaço e os dados do perfil desaparecerão do telefone. Não é possível desfazer esta ação."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Restrições de aplic. e conteúdo"</string>
     <string name="user_rename" msgid="8523499513614655279">"RENOMEAR"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Definir limites do aplicativo"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlado por <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Este aplicativo não é compatível com perfis restritos"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Este aplicativo pode acessar suas contas"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi e redes móveis"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Permitir modificação das configurações de Wi-Fi e redes móveis"</string>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 436d800..7a3ff53 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -158,7 +158,8 @@
     <!-- no translation found for app_ops_categories:0 (6358963769537892925) -->
     <!-- no translation found for app_ops_categories:1 (255608127647030286) -->
     <!-- no translation found for app_ops_categories:2 (4588829735729884491) -->
-    <!-- no translation found for app_ops_categories:3 (8971765125227378270) -->
+    <!-- no translation found for app_ops_categories:3 (886742181977884584) -->
+    <!-- no translation found for app_ops_categories:4 (7924928667052300589) -->
     <!-- no translation found for app_ops_summaries:0 (4979188868761515915) -->
     <!-- no translation found for app_ops_summaries:1 (5789673140227507995) -->
     <!-- no translation found for app_ops_summaries:2 (1061584358377390581) -->
@@ -190,6 +191,16 @@
     <!-- no translation found for app_ops_summaries:28 (5031552983987798163) -->
     <!-- no translation found for app_ops_summaries:29 (8374996688066472414) -->
     <!-- no translation found for app_ops_summaries:30 (3045529469061083747) -->
+    <!-- no translation found for app_ops_summaries:31 (5124443975763747838) -->
+    <!-- no translation found for app_ops_summaries:32 (4547883971364273343) -->
+    <!-- no translation found for app_ops_summaries:33 (2603878814882344450) -->
+    <!-- no translation found for app_ops_summaries:34 (7136963238377062018) -->
+    <!-- no translation found for app_ops_summaries:35 (4270236897655923007) -->
+    <!-- no translation found for app_ops_summaries:36 (6325739889222559394) -->
+    <!-- no translation found for app_ops_summaries:37 (5762123934816216821) -->
+    <!-- no translation found for app_ops_summaries:38 (785049718065337473) -->
+    <!-- no translation found for app_ops_summaries:39 (6700305533746877052) -->
+    <!-- no translation found for app_ops_summaries:40 (2029227495214047094) -->
     <!-- no translation found for app_ops_labels:0 (6602854600289714121) -->
     <!-- no translation found for app_ops_labels:1 (8677040780775113033) -->
     <!-- no translation found for app_ops_labels:2 (1660743989948992916) -->
@@ -221,6 +232,16 @@
     <!-- no translation found for app_ops_labels:28 (3493046322001257041) -->
     <!-- no translation found for app_ops_labels:29 (136815868796597058) -->
     <!-- no translation found for app_ops_labels:30 (5238692940326972503) -->
+    <!-- no translation found for app_ops_labels:31 (5753789168376302997) -->
+    <!-- no translation found for app_ops_labels:32 (3265262911688671938) -->
+    <!-- no translation found for app_ops_labels:33 (2098976479485046797) -->
+    <!-- no translation found for app_ops_labels:34 (5660213838861789350) -->
+    <!-- no translation found for app_ops_labels:35 (7983336752371254444) -->
+    <!-- no translation found for app_ops_labels:36 (7878027809189330917) -->
+    <!-- no translation found for app_ops_labels:37 (7260546305036218513) -->
+    <!-- no translation found for app_ops_labels:38 (9103719301075748925) -->
+    <!-- no translation found for app_ops_labels:39 (7025966722295861512) -->
+    <!-- no translation found for app_ops_labels:40 (4665183401128289653) -->
     <!-- no translation found for long_press_timeout_selector_titles:0 (3511504869290423954) -->
     <!-- no translation found for long_press_timeout_selector_titles:1 (2560532955514699713) -->
     <!-- no translation found for long_press_timeout_selector_titles:2 (2372711992605524591) -->
@@ -267,6 +288,9 @@
     <!-- no translation found for track_frame_time_entries:1 (2751513398307949636) -->
     <!-- no translation found for track_frame_time_entries:2 (8272260411216018353) -->
     <!-- no translation found for track_frame_time_entries:3 (120512413928262547) -->
+    <!-- no translation found for debug_hw_overdraw_entries:0 (8190572633763871652) -->
+    <!-- no translation found for debug_hw_overdraw_entries:1 (7688197031296835369) -->
+    <!-- no translation found for debug_hw_overdraw_entries:2 (8332661909019981149) -->
     <!-- no translation found for app_process_limit_entries:0 (3401625457385943795) -->
     <!-- no translation found for app_process_limit_entries:1 (4071574792028999443) -->
     <!-- no translation found for app_process_limit_entries:2 (4810006996171705398) -->
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 5dcfb82..c27f729 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -433,6 +433,10 @@
     <skip />
     <!-- no translation found for user_info_settings_title (1195015434996724736) -->
     <skip />
+    <!-- no translation found for show_profile_info_on_lockscreen_label (2741208907263877990) -->
+    <skip />
+    <!-- no translation found for profile_info_settings_title (3518603215935346604) -->
+    <skip />
     <!-- no translation found for location_settings_title (4483843407328665068) -->
     <skip />
     <!-- no translation found for security_settings_title (7945465324818485460) -->
@@ -1892,10 +1896,7 @@
     <skip />
     <!-- no translation found for keyboard_layout_picker_title (556081931972771610) -->
     <skip />
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicziunari da l\'utilisader"</string>
-    <!-- no translation found for user_dict_single_settings_title (524997218433540614) -->
-    <skip />
-    <!-- no translation found for user_dict_multiple_settings_title (3735224433307996276) -->
+    <!-- no translation found for user_dict_settings_title (3427169369758733521) -->
     <skip />
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Agiuntar"</string>
@@ -2234,6 +2235,8 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Autezza dal tun"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Influenzescha il tun dal text discurrì"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Lingua"</string>
+    <!-- no translation found for tts_lang_not_selected (7395787019276734765) -->
+    <skip />
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Definescha la vusch specifica da mintga lingua per il text pledà"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Tadlar in exempel"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Far ina curta demonstraziun da la sintesa vocala"</string>
@@ -2621,9 +2624,7 @@
     <skip />
     <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
     <skip />
-    <!-- no translation found for show_hw_overdraw (1136884304711318251) -->
-    <skip />
-    <!-- no translation found for show_hw_overdraw_summary (4295714000923082647) -->
+    <!-- no translation found for debug_hw_overdraw (2968692419951565417) -->
     <skip />
     <!-- no translation found for disable_overlays (2074488440505934665) -->
     <skip />
@@ -2928,6 +2929,10 @@
     <skip />
     <!-- no translation found for user_summary_restricted_profile (6354966213806839107) -->
     <skip />
+    <!-- no translation found for user_need_lock_message (2596365678651842785) -->
+    <skip />
+    <!-- no translation found for user_set_lock_button (8311219392856626841) -->
+    <skip />
     <!-- no translation found for user_summary_not_set_up (8778205026866794909) -->
     <skip />
     <!-- no translation found for user_summary_restricted_not_set_up (1628116001964325544) -->
@@ -2942,7 +2947,7 @@
     <skip />
     <!-- no translation found for user_add_user_item_summary (4702776187132008661) -->
     <skip />
-    <!-- no translation found for user_add_profile_item_summary (2505099177666579571) -->
+    <!-- no translation found for user_add_profile_item_summary (5931663986889138941) -->
     <skip />
     <!-- no translation found for user_add_user_item_title (8212199632466198969) -->
     <skip />
@@ -3026,7 +3031,7 @@
     <skip />
     <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
     <skip />
-    <!-- no translation found for user_restrictions_title (371835484894400390) -->
+    <!-- no translation found for user_restrictions_title (7745810037152772035) -->
     <skip />
     <!-- no translation found for user_rename (8523499513614655279) -->
     <skip />
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 3d909a8..c5260fd 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Locație"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Mesagerie"</item>
-    <item msgid="8971765125227378270">"Gadget"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Dispozitiv"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"locație imprecisă"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"redă conținut audio"</item>
     <item msgid="8374996688066472414">"citește clipboardul"</item>
     <item msgid="3045529469061083747">"modifică clipboardul"</item>
+    <item msgid="5124443975763747838">"butoane media"</item>
+    <item msgid="4547883971364273343">"focalizare audio"</item>
+    <item msgid="2603878814882344450">"volum principal"</item>
+    <item msgid="7136963238377062018">"volum voce"</item>
+    <item msgid="4270236897655923007">"volum sonerie"</item>
+    <item msgid="6325739889222559394">"volum media"</item>
+    <item msgid="5762123934816216821">"volum alarmă"</item>
+    <item msgid="785049718065337473">"volum notificări"</item>
+    <item msgid="6700305533746877052">"volumul Bluetooth"</item>
+    <item msgid="2029227495214047094">"mențineți activ"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Locație"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Redă conținut audio"</item>
     <item msgid="136815868796597058">"Citește clipboardul"</item>
     <item msgid="5238692940326972503">"Modifică clipboardul"</item>
+    <item msgid="5753789168376302997">"Butoane media"</item>
+    <item msgid="3265262911688671938">"Focalizare audio"</item>
+    <item msgid="2098976479485046797">"Volum principal"</item>
+    <item msgid="5660213838861789350">"Volum voce"</item>
+    <item msgid="7983336752371254444">"Volum sonerie"</item>
+    <item msgid="7878027809189330917">"Volum media"</item>
+    <item msgid="7260546305036218513">"Volum alarmă"</item>
+    <item msgid="9103719301075748925">"Volum notificări"</item>
+    <item msgid="7025966722295861512">"Volum Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mențineți activ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Scurtă"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Pe ecran ca linii"</item>
     <item msgid="120512413928262547">"În adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Dezactivată"</item>
+    <item msgid="7688197031296835369">"Afișați zonele cu suprapunere"</item>
+    <item msgid="8332661909019981149">"Afișați contorul de suprapunere"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limita standard"</item>
     <item msgid="4071574792028999443">"Nu există procese de fundal"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 124dc97..b6eb8cc 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Introduceţi textul de afişat pe ecranul de blocare"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Informații utilizator pe ecranul de blocare"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Info. utilizator"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Afișați informații profil la blocarea ecranului"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informații profil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Acces la locaţie"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Securitate"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setaţi Locaţia mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificaţi reţeaua"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Vedeți rețelele disponibile activând Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Se caută rețele Wi-Fi…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nu aveți permisiunea să modificați rețeaua Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Altă reţea…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mai multe"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automată (WPS)"</string>
@@ -1235,9 +1236,7 @@
     <!-- no translation found for keyboard_layout_default_label (2952672513543482165) -->
     <skip />
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Aspecte tastatură"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicţionarul utilizatorului"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicţionar personal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dicţionare personale"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dicționar personal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Adăugaţi"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Adăugaţi în dicţionar"</string>
@@ -1446,7 +1445,7 @@
     <string name="recognizer_settings_title" msgid="432493301215113154">"Căutare vocală"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Setări pentru „<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>”"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Setări text în vorbire"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Transformare text in vorbire"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"Transformare text în vorbire"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Doresc să se utilizeze întotdeauna setările mele"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Setările prestabilite de mai jos înlocuiesc setările aplicaţiei"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Setări standard"</string>
@@ -1457,6 +1456,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Înălţime"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afectează tonul textului vorbit"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Limbă"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nu ați selectat limba"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Setează vocea caracteristică limbii pentru textul vorbit"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ascultaţi un exemplu"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Redaţi o demonstraţie scurtă a sintetizării vorbirii"</string>
@@ -1673,8 +1673,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Iluminare ecrane din ferestre la desenarea cu GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Actualiz. strat. hardware"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Straturile hardware clipesc verde la actualizare"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Nivel suprapunere GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Max. – min.: albastru, verde, roşu deschis, roşu."</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Depanați suprapunerea"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Dezactivaţi suprapun. HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizaţi mereu GPU pentru compunerea ecranului"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Monitorizări OpenGL"</string>
@@ -1827,6 +1826,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Utilizatori și profiluri"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Adăugați un utilizator/un profil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil limitat"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Înainte de a putea crea un profil cu permisiuni limitate, va trebui să configurați blocarea ecranului pentru a vă proteja aplicațiile și datele personale."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Configurați blocarea"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Neconfigurat"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Neconfigurat – Profil cu permisiuni limitate"</string>
     <string name="user_owner" msgid="3879126011135546571">"Proprietar"</string>
@@ -1834,7 +1835,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Pseudonim"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Adăugați"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Utilizatorii dețin aplicații și materiale proprii"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Profilurile cu permisiuni limitate pot doar să acceseze aplicațiile și conținutul din conturile dvs."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Puteți restricționa accesul la aplicații și la conținut din contul dvs."</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilizator"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil limitat"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Adăugaţi un utilizator nou"</string>
@@ -1847,23 +1848,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nu acum"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Numai proprietarul tabletei poate gestiona utilizatorii."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Numai proprietarul telefonului poate gestiona utilizatorii."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profilurile cu permisiuni limitate nu pot adăuga conturi"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Ștergeţi <xliff:g id="USER_NAME">%1$s</xliff:g> de pe gadget"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Utilizator nou"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Profil nou"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vă eliminaţi ca utilizator?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Eliminaţi utilizatorul?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Eliminați profilul?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Veţi pierde spaţiul şi datele de pe această tabletă. Nu puteţi anula această acţiune."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Veţi pierde spaţiul şi datele de pe acest telefon. Nu puteţi anula această acţiune."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Spaţiul şi datele acestui utilizator vor dispărea de pe tabletă. Nu puteţi anula această acţiune."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Spaţiul şi datele acestui utilizator vor dispărea de pe telefon. Nu puteţi anula această acţiune."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Spațiul și datele acestui profil vor dispărea de pe tabletă. Nu puteți anula această acțiune."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Spațiul și datele acestui profil vor dispărea de pe telefon. Nu puteți anula această acțiune."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Se adaugă un utilizator nou…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Ștergeţi utilizatorul"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Ștergeţi"</string>
@@ -1880,12 +1877,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Restricții aplicații și conținut"</string>
     <string name="user_rename" msgid="8523499513614655279">"REDENUMIȚI"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Setați limite pentru aplicații"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlate de <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Această aplicație nu este acceptată pentru profilurile cu permisiuni limitate"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Această aplicație poate accesa conturile dvs."</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Rețele Wi‑Fi și mobile"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Permiteți modificarea setărilor pentru rețele Wi‑Fi și mobile"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 5ce9513..01d3c7d 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Местоположение"</item>
     <item msgid="255608127647030286">"Личные данные"</item>
     <item msgid="4588829735729884491">"SMS/MMS"</item>
-    <item msgid="8971765125227378270">"Устройство"</item>
+    <item msgid="886742181977884584">"Мультимедиа"</item>
+    <item msgid="7924928667052300589">"Устройство"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"приблизительное местоположение"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"воспроизвести аудио"</item>
     <item msgid="8374996688066472414">"считать из буфера обмена"</item>
     <item msgid="3045529469061083747">"изменить буфер обмена"</item>
+    <item msgid="5124443975763747838">"кнопки мультимедиа"</item>
+    <item msgid="4547883971364273343">"аудиофокус"</item>
+    <item msgid="2603878814882344450">"общая громкость"</item>
+    <item msgid="7136963238377062018">"громкость голоса"</item>
+    <item msgid="4270236897655923007">"громкость звонка"</item>
+    <item msgid="6325739889222559394">"громкость мультимедиа"</item>
+    <item msgid="5762123934816216821">"громкость будильника"</item>
+    <item msgid="785049718065337473">"громкость уведомлений"</item>
+    <item msgid="6700305533746877052">"громкость Bluetooth-устройств"</item>
+    <item msgid="2029227495214047094">"не отключать"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Местоположение"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Воспроизвести аудио"</item>
     <item msgid="136815868796597058">"Считать из буфера обмена"</item>
     <item msgid="5238692940326972503">"Изменить буфер обмена"</item>
+    <item msgid="5753789168376302997">"Кнопки мультимедиа"</item>
+    <item msgid="3265262911688671938">"Аудиофокус"</item>
+    <item msgid="2098976479485046797">"Общая громкость"</item>
+    <item msgid="5660213838861789350">"Громкость голоса"</item>
+    <item msgid="7983336752371254444">"Громкость звонка"</item>
+    <item msgid="7878027809189330917">"Громкость мультимедиа"</item>
+    <item msgid="7260546305036218513">"Громкость будильника"</item>
+    <item msgid="9103719301075748925">"Громкость уведомлений"</item>
+    <item msgid="7025966722295861512">"Громкость Bluetooth-устройств"</item>
+    <item msgid="4665183401128289653">"Не отключать"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Небольшая"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"На экране в виде линий"</item>
     <item msgid="120512413928262547">"В adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"ВЫКЛ"</item>
+    <item msgid="7688197031296835369">"Показывать области наложения"</item>
+    <item msgid="8332661909019981149">"Показывать число объектов"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартное ограничение"</item>
     <item msgid="4071574792028999443">"Без фоновых процессов"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b8a2cd9..b155ae2 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Введите текст для показа на экране блокировки"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Показывать введенный ниже текст на экране блокировки"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Сведения о пользователе"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Показывать информацию профиля на заблокированном экране"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Информация профиля"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Мое местоположение"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Безопасность"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Изменить сеть"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Чтобы посмотреть доступные сети, включите Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Поиск сетей Wi-Fi…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"У вас недостаточно прав для изменения настроек сети Wi‑Fi"</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Другая сеть…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Ещё"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Автонастройка (WPS)"</string>
@@ -992,7 +993,7 @@
     <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>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"О планшете"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"О телефоне"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Просмотр юридической информации, состояния планшетного ПК и версии ПО"</string>
     <string name="legal_information" msgid="5769301644270604095">"Юридическая информация"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Для смены нажмите CTRL + Пробел"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"По умолчанию"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Раскладка клавиатуры"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Словарь пользователя"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Пользовательский словарь"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Пользовательские словари"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Пользовательский словарь"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Добавить"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Добавление в словарь"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Тон"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Влияет на высоту синтезированной речи"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Язык"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Язык не выбран"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Выбор языка для чтения текста"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Прослушать пример"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Воспроизвести краткую демонстрацию синтезированной речи"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Подсвечивать области экрана при отрисовке с GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Показ. аппаратные обновл."</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Выделять аппаратные уровни зеленым при обновлении"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Показывать наложения"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Порядок: синий, зеленый, светло-красный, красный"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Отладка наложения"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Откл. аппарат. наложения"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Всегда использовать GPU при компоновке экрана"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Вкл. трассировку OpenGL"</string>
@@ -1828,6 +1827,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Пользователи и профили"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Добавить пользователя/профиль"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Профиль с ограниченным доступом"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Чтобы создать профиль с ограниченным доступом, необходимо предварительно настроить блокировку экрана для защиты приложений и личных данных"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Включить блокировку"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не настроено"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Не настроено – профиль с ограниченным доступом"</string>
     <string name="user_owner" msgid="3879126011135546571">"Владелец"</string>
@@ -1835,7 +1836,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Псевдоним"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Добавление"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"У пользователей есть свои приложения и контент"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Профиль с ограниченным доступом позволяет обращаться к приложениям и контенту только из ваших аккаунтов"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Вы можете ограничить доступ к приложениям и контенту из вашего аккаунта"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Добавить пользователя"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Профиль с огр. доступом"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Добавить пользователя"</string>
@@ -1848,23 +1849,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не сейчас"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Только владелец может настроить устройство для других пользователей."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Только владелец может настроить устройство для других пользователей."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Пользователи с ограниченным доступом не могут добавлять аккаунты"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Удалить пользователя <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Новый пользователь"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Новый профиль"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Удалить ваш аккаунт?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Удалить аккаунт?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Удалить профиль?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Ваши данные, сохраненные на этом устройстве, будут удалены без возможности восстановления."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Ваши данные, сохраненные на этом устройстве, будут удалены без возможности восстановления."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Сохраненные на устройстве данные этого пользователя будут удалены без возможности восстановления."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Сохраненные на устройстве данные этого пользователя будут удалены без возможности восстановления."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Сохраненные на планшетном ПК данные этого профиля будут удалены без возможности восстановления"</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Сохраненные на телефоне данные этого профиля будут удалены без возможности восстановления"</string>
     <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>
@@ -1881,12 +1878,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Ограничения для приложения и контента"</string>
     <string name="user_rename" msgid="8523499513614655279">"ПЕРЕИМЕНОВАТЬ"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Установить ограничения"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Под управлением приложения \"<xliff:g id="APP">%1$s</xliff:g>\""</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Приложение не поддерживается в профилях с ограниченным доступом"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Этому приложению разрешен доступ к вашим аккаунтам"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi и мобильная сеть"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Разрешить изменение настроек Wi‑Fi и мобильной сети"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 6ab5e68..d5d0231 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Poloha"</item>
     <item msgid="255608127647030286">"Osobné"</item>
     <item msgid="4588829735729884491">"SMS a MMS"</item>
-    <item msgid="8971765125227378270">"Zariadenie"</item>
+    <item msgid="886742181977884584">"Médiá"</item>
+    <item msgid="7924928667052300589">"Zariadenie"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"približná poloha"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"prehrávanie zvuku"</item>
     <item msgid="8374996688066472414">"načítať schránku"</item>
     <item msgid="3045529469061083747">"upraviť schránku"</item>
+    <item msgid="5124443975763747838">"mediálne tlačidlá"</item>
+    <item msgid="4547883971364273343">"zvukové zameranie"</item>
+    <item msgid="2603878814882344450">"hlavná hlasitosť"</item>
+    <item msgid="7136963238377062018">"hlasitosť hlasu"</item>
+    <item msgid="4270236897655923007">"hlasitosť zvonenia"</item>
+    <item msgid="6325739889222559394">"hlasitosť médií"</item>
+    <item msgid="5762123934816216821">"hlasitosť budíka"</item>
+    <item msgid="785049718065337473">"hlasitosť upozornení"</item>
+    <item msgid="6700305533746877052">"hlasitosť bluetooth"</item>
+    <item msgid="2029227495214047094">"zakázať režim spánku"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Poloha"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Prehrať zvuk"</item>
     <item msgid="136815868796597058">"Načítať schránku"</item>
     <item msgid="5238692940326972503">"Upraviť schránku"</item>
+    <item msgid="5753789168376302997">"Tlačidlá médií"</item>
+    <item msgid="3265262911688671938">"Zameranie zvuku"</item>
+    <item msgid="2098976479485046797">"Hlavná hlasitosť"</item>
+    <item msgid="5660213838861789350">"Hlasitosť hlasu"</item>
+    <item msgid="7983336752371254444">"Hlasitosť zvonenia"</item>
+    <item msgid="7878027809189330917">"Hlasitosť médií"</item>
+    <item msgid="7260546305036218513">"Hlasitosť budíka"</item>
+    <item msgid="9103719301075748925">"Hlasitosť upozornení"</item>
+    <item msgid="7025966722295861512">"Hlasitosť zariadenia Bluetooth"</item>
+    <item msgid="4665183401128289653">"Zakázať režim spánku"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátka"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Na obrazovke v podobe riadkov"</item>
     <item msgid="120512413928262547">"V adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Vypnuté"</item>
+    <item msgid="7688197031296835369">"Zobraziť oblasti prekreslení"</item>
+    <item msgid="8332661909019981149">"Zobraziť počítadlo prekreslení"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Štandardný limit"</item>
     <item msgid="4071574792028999443">"Žiadne procesy na pozadí"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7372ff1..ff06bc2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Zadajte text, ktorý sa zobrazí na uzamknutej obrazovke"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Zobraz. informácie používateľa na uzamk. obrazovke"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Inf. o používateľovi"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Zobraziť inform. o profile na uzamknutej obrazovke"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informácie o profile"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Prístup k polohe"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Zabezpečenie"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok ukladacieho priestoru poverení"</string>
@@ -555,7 +557,7 @@
     <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_title" msgid="5149574280392680092">"Ponechať 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>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizovať spotrebu batérie pri zapnutej sieti Wi-Fi"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upraviť sieť"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ak chcete zobraziť dostupné siete, zapnite Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Prebieha vyhľadávanie sietí Wi-Fi..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nemáte povolenie na zmenu siete Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Iná sieť..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Viac"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatické nastavenie (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Prepnite klávesmi ctrl-space"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predvolené"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Rozloženia klávesnice"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Používateľský slovník"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osobný slovník"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobné slovníky"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Osobný slovník"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Pridať"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Pridať do slovníka"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Výška"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Určuje zvuk hovoreného textu"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jazyk"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nebol vybratý jazyk"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavenia jazyka hlasu pre hovorený text"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Vypočuť príklad"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Prehrať krátku ukážku syntézy reči"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Zobrazenia v oknách vykresľované s GPU blikajú"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Zobr. aktual. hardv. vrs."</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Hard. vrstvy pri aktualizácii blikajú na zeleno"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Zobraziť prekreslenie GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Od najlepš. k najhorš.: modr., zel., sv. červ., červ."</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Ladenie prekresľovania GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Zakázať hardvér. prekrytia"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy používať jednotku GPU na skladanie obrazovky"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Povoliť trasovanie OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Používatelia a profily"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Pridať používateľa alebo profil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Obmedzený profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Ak chcete vytvoriť profil s obmedzeniami, najprv musíte nastaviť uzamknutie obrazovky na ochranu aplikácií a osobných údajov."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Nastaviť uzamknutie"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nenastavené"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Nie je nastavený – obmedzený profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Vlastník"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Prezývka"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Pridať"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Používatelia majú svoje vlastné aplikácie a obsah"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Obmedzené profily môžu pristupovať iba k aplikáciám a obsahu z vašich účtov"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Môžete obmedziť prístup k aplikáciám a obsahu z vášho účtu"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Používateľ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Obmedzený profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Pridať nového používateľa"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Teraz nie"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Používateľov môže spravovať iba vlastník tabletu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Používateľov môže spravovať iba vlastník telefónu."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profily s obmedzeniami nemôžu pridávať účty"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Odstrániť <xliff:g id="USER_NAME">%1$s</xliff:g> zo zariadenia"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nový používateľ"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nový profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Chcete odstrániť svoj profil?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Odstrániť používateľa?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Chcete odstrániť profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Prídete o miesto v pamäti a údaje v tomto tablete. Táto akcia sa nedá vrátiť späť."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Prídete o miesto v pamäti a údaje v tomto telefóne. Táto akcia sa nedá vrátiť späť."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Miesto v pamäti a údaje používateľa sa z tabletu odstránia. Táto akcia sa nedá vrátiť späť."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Miesto v pamäti a údaje používateľa sa z telefónu odstránia. Táto akcia sa nedá vrátiť späť."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Z tabletu sa odstráni miesto v pamäti a údaje profilu. Táto akcia sa nedá vrátiť späť."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Z telefónu sa odstráni miesto v pamäti a údaje profilu. Táto akcia sa nedá vrátiť späť."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Obmedzenia aplikácií a obsahu"</string>
     <string name="user_rename" msgid="8523499513614655279">"PREMENOVAŤ"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Nastaviť obmedzenia aplikácie"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Riadi: <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Profily s obmedzeniami nepodporujú túto aplikáciu"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Táto aplikácia môže pristupovať k vašim účtom"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Siete Wi-Fi a mobilné siete"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Povoliť úpravu nastavení sietí Wi-Fi a mobilných sietí"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index d31eb74..a90dca2 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Lokacija"</item>
     <item msgid="255608127647030286">"Osebno"</item>
     <item msgid="4588829735729884491">"Sporočila"</item>
-    <item msgid="8971765125227378270">"Naprava"</item>
+    <item msgid="886742181977884584">"Predstavnosti"</item>
+    <item msgid="7924928667052300589">"Naprava"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"groba lokacija"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"predvajanje zvoka"</item>
     <item msgid="8374996688066472414">"preberi odložišče"</item>
     <item msgid="3045529469061083747">"spremeni odložišče"</item>
+    <item msgid="5124443975763747838">"gumbi za predstavnosti"</item>
+    <item msgid="4547883971364273343">"fokus zvoka"</item>
+    <item msgid="2603878814882344450">"glavna glasnost"</item>
+    <item msgid="7136963238377062018">"glasnost glasu"</item>
+    <item msgid="4270236897655923007">"glasnost zvonjenja"</item>
+    <item msgid="6325739889222559394">"glasnost predstavnosti"</item>
+    <item msgid="5762123934816216821">"glasnost alarma"</item>
+    <item msgid="785049718065337473">"glasnost obvestila"</item>
+    <item msgid="6700305533746877052">"glasnost za Bluetooth"</item>
+    <item msgid="2029227495214047094">"ohrani odklenjen zaslon"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokacija"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Predvajanje zvoka"</item>
     <item msgid="136815868796597058">"Preberi odložišče"</item>
     <item msgid="5238692940326972503">"Spremeni odložišče"</item>
+    <item msgid="5753789168376302997">"Gumbi za predstavnosti"</item>
+    <item msgid="3265262911688671938">"Osredotočenost zvoka"</item>
+    <item msgid="2098976479485046797">"Glavna glasnost"</item>
+    <item msgid="5660213838861789350">"Glasnost glasu"</item>
+    <item msgid="7983336752371254444">"Glasnost zvonjenja"</item>
+    <item msgid="7878027809189330917">"Glasnost predstavnosti"</item>
+    <item msgid="7260546305036218513">"Glasnost alarma"</item>
+    <item msgid="9103719301075748925">"Glasnost obvestila"</item>
+    <item msgid="7025966722295861512">"Glasnost Bluetootha"</item>
+    <item msgid="4665183401128289653">"Ohrani odklenjen zaslon"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Na zaslonu kot črte"</item>
     <item msgid="120512413928262547">"V gfxinfo dumpsys lupine adb"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Izklop"</item>
+    <item msgid="7688197031296835369">"Risanje zunaj vidnega območja"</item>
+    <item msgid="8332661909019981149">"Števec risanja zunaj vidn. območja"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna omejitev"</item>
     <item msgid="4071574792028999443">"Ni postopkov v ozadju"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 67dff0e..e438674 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Vnesite besedilo za prikaz na zaslonu za zaklepanje"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Pokaži podatke o uporabniku na zaklenjenem zaslonu"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Podatki o uporabniku"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Pokaži podatke o profilu na zaklenjenem zaslonu"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Podatki o profilu"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Dostop do lokacije"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Varnost"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Spremeni omrežje"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Za prikaz razpoložljivih omrežij vklopite Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Iskanje omrežij Wi-Fi …"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nimate dovoljenja za spreminjanje omrežja Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Drugo omrežje ..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Več"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Samodej. nastavitev (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Preklopite s Ctrl + preslednica"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Privzeto"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Razporeditve tipkovnice"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Uporabniški slovar"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osebni slovar"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osebni slovarji"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Osebni slovar"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Dodaj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Dodaj v slovar"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Višina tona"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Vpliva na ton govorjenega besedila"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Jezik ni izbran"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavite glas, odvisen od jezika, za govorjeno besedilo"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Poslušaj primer"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Predvajaj kratko predstavitev sinteze govora"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Osvetli poglede v oknih pri risanju z GPE"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Pokaži pos. sl. str. opr."</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Obarvaj sloje strojne opreme zeleno ob posodobitvi"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Prikaži prepisovanje GPE"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Od najboljšega do najslabšega: modra, zelena, svetlo rdeča, rdeča"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Odpr. nap. ris. zunaj vidn. obm. za GPE"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Onem. strojni medp."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Za sestavljanje slike vedno uporabi graf. procesor"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogoči sledi OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Uporabniki in profili"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Dodajanje uporabnika ali profila"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Omejen profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Preden lahko ustvarite profil z omejitvami, morate nastaviti zaklepanje zaslona, da zaščitite aplikacije in osebne podatke."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Nastavi zaklepanje"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Uporabnik ni nastavljen"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Ni nastavljeno – omejen profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Lastnik"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Vzdevek"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Dodaj"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Uporabniki imajo svoje aplikacije in vsebino"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Omejeni profili lahko dostopajo samo do aplikacij in vsebine iz vaših računov."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Dostop do aplikacij in vsebine iz vašega računa lahko omejite"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Uporabnik"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Omejen profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj novega uporabnika"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ne zdaj"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Uporabnike lahko upravlja samo lastnik tabličnega računalnika."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Uporabnike lahko upravlja samo lastnik telefona."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profili z omejitvami ne morejo dodajati računov"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Izbris up. <xliff:g id="USER_NAME">%1$s</xliff:g> iz napr."</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nov uporabnik"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nov profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Želite izbrisati sebe?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Želite odstr. uporabnika?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Želite odstraniti profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"V tem tabličnem računalniku boste izgubili prostor in podatke. Tega dejanja ni mogoče razveljaviti."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"V tem telefonu boste izgubili prostor in podatke. Tega dejanja ni mogoče razveljaviti."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Prostor in podatki tega uporabnika bodo izginili iz tega tabličnega računalnika. Tega dejanja ni mogoče razveljaviti."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Prostor in podatki tega uporabnika bodo izginili iz tega telefona. Tega dejanja ni mogoče razveljaviti."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Prostor in podatki tega profila bodo izginili iz tabličnega računalnika. Tega dejanja ni mogoče razveljaviti."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Prostor in podatki tega profila bodo izginili iz telefona. Tega dejanja ni mogoče razveljaviti."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Omejitve za aplikacije in vsebino"</string>
     <string name="user_rename" msgid="8523499513614655279">"PREIMENOVANJE"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Nastavitev omejitev za aplikacije"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Nadzira aplikacija <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ta aplikacija ni podprta za profile z omejitvami"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ta aplikacija lahko dostopa do vaših računov"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi in mobilna omrežja"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Dovoli spreminjanje nastavitev za Wi-Fi in mobilna omrežja"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 8552560..3c3dc42 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Локација"</item>
     <item msgid="255608127647030286">"Лично"</item>
     <item msgid="4588829735729884491">"Размена порука"</item>
-    <item msgid="8971765125227378270">"Уређај"</item>
+    <item msgid="886742181977884584">"Медији"</item>
+    <item msgid="7924928667052300589">"Уређај"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"оквирна локација"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"пуштање аудио записа"</item>
     <item msgid="8374996688066472414">"читање меморије"</item>
     <item msgid="3045529469061083747">"мењање меморије"</item>
+    <item msgid="5124443975763747838">"дугмад за медије"</item>
+    <item msgid="4547883971364273343">"аудио фокус"</item>
+    <item msgid="2603878814882344450">"главна јачина звука"</item>
+    <item msgid="7136963238377062018">"јачина звука гласа"</item>
+    <item msgid="4270236897655923007">"јачина звука звона"</item>
+    <item msgid="6325739889222559394">"јачина звука медија"</item>
+    <item msgid="5762123934816216821">"јачина звука аларма"</item>
+    <item msgid="785049718065337473">"јачина звука обавештења"</item>
+    <item msgid="6700305533746877052">"јачина звука Bluetooth-а"</item>
+    <item msgid="2029227495214047094">"задржавање ван стања спавања"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Локација"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Пуштање аудио записа"</item>
     <item msgid="136815868796597058">"Читање меморије"</item>
     <item msgid="5238692940326972503">"Мењање меморије"</item>
+    <item msgid="5753789168376302997">"Дугмад за медије"</item>
+    <item msgid="3265262911688671938">"Аудио фокус"</item>
+    <item msgid="2098976479485046797">"Главна јачина звука"</item>
+    <item msgid="5660213838861789350">"Јачина звука гласа"</item>
+    <item msgid="7983336752371254444">"Јачина звука звона"</item>
+    <item msgid="7878027809189330917">"Јачина звука медија"</item>
+    <item msgid="7260546305036218513">"Јачина звука аларма"</item>
+    <item msgid="9103719301075748925">"Јачина звука обавештења"</item>
+    <item msgid="7025966722295861512">"Јачина звука Bluetooth-а"</item>
+    <item msgid="4665183401128289653">"Задржи ван стања спавања"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"На екрану у виду линија"</item>
     <item msgid="120512413928262547">"У adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Искључи"</item>
+    <item msgid="7688197031296835369">"Прикажи области преклапања"</item>
+    <item msgid="8332661909019981149">"Прикажи бројач преклапања"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандардно ограничење"</item>
     <item msgid="4071574792028999443">"Без позадинских процеса"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9f62907..35fbbbf 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Унесите текст за приказ на екрану за закључавање"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Прикажи информације о кориснику на закљ. екрану"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Подаци о кориснику"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Прикажи податке о профилу на закључаном екрану"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Подаци о профилу"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Приступ локацији"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Безбедност"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
@@ -555,7 +557,7 @@
     <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_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>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Смањи коришћење батерије када је Wi-Fi укључен"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Измени мрежу"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Да бисте видели доступне мреже, укључите Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Тражење Wi-Fi мрежа..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Немате дозволу да мењате Wi‑Fi мрежу."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Друга мрежа..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Још"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Аутоматско подешавање (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Да бисте пребацили, притисните Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Подразумевано"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Распореди тастатуре"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Кориснички речник"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Лични речник"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Лични речници"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Лични речник"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Додај"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Додавање у речник"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ниво"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Утиче на тон изговореног текста"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Језик"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Језик није изабран"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Подешава глас специфичан за језик намењен говорном тексту"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Послушај пример"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Пуштање кратке демонстрације синтезе говора"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Осветли приказе у прозор. када се црта са GPU-ом"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Прикажи ажурирања хардверских слојева"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Хардверски слојеви трепере зелено када се ажурирају"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Прикажи прекорачење GPU-а"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Од најбољег ка најгорем: плаво, зелено, светлоцрвено, црвено"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Отклони грешке GPU преклапања"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Онемог. HW пост. елементе"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Увек користи GPU за компоновање екрана"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Омогући OpenGL трагове"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Корисници и профили"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Додај корисника или профил"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ограничени профил"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Да бисте могли да направите ограничени профил, потребно је да подесите закључавање екрана да бисте заштитили апликације и личне податке."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Подеси закључавање"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Није подешено"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Није подешен – Ограничени профил"</string>
     <string name="user_owner" msgid="3879126011135546571">"Власник"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Надимак"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Додавање"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Корисници имају сопствене апликације и садржај"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Ограничени профили могу да приступају само апликацијама и садржају са ваших налога"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Можете да ограничите приступ на апликације и садржај са налога"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Корисник"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ограничени профил"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Додавање новог корисника"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не сада"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Само власник таблета може да управља корисницима."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Само власник телефона може да управља корисницима."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ограничени профили не могу да додају налоге"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Избриши <xliff:g id="USER_NAME">%1$s</xliff:g> са уређаја"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Нови корисник"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Нови профил"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Желите ли да избришете себе?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Уклоните корисника?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Желите да уклон. профил?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Изгубићете простор и податке на овом таблету. Не можете да опозовете ову радњу."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Изгубићете простор и податке на овом телефону. Не можете да опозовете ову радњу."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Простор и подаци овог корисника ће нестати са овог таблета. Не можете да опозовете ову радњу."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Простор и подаци овог корисника ће нестати са овог телефона. Не можете да опозовете ову радњу."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Простор и подаци овог профила ће нестати са овог таблета. Не можете да опозовете ову радњу."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Простор и подаци овог профила ће нестати са овог телефона. Не можете да опозовете ову радњу."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Ограничења апликација и садржаја"</string>
     <string name="user_rename" msgid="8523499513614655279">"ПРЕИМЕНУЈ"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Подеси ограничења апликација"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Контролише <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ова апликација није подржана на ограниченим профилима"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ова апликација може да приступа налозима"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi и мобилни уређаји"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Дозволите измену Wi‑Fi подешавања и подешавања за мобилне уређаје"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 941aee8..c3d3183 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Plats"</item>
     <item msgid="255608127647030286">"Personligt"</item>
     <item msgid="4588829735729884491">"Meddelanden"</item>
-    <item msgid="8971765125227378270">"Enhet"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Enhet"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ungefärlig plats"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"spela upp ljud"</item>
     <item msgid="8374996688066472414">"läs Urklipp"</item>
     <item msgid="3045529469061083747">"ändra Urklipp"</item>
+    <item msgid="5124443975763747838">"medieknappar"</item>
+    <item msgid="4547883971364273343">"ljudinställning"</item>
+    <item msgid="2603878814882344450">"mastervolym"</item>
+    <item msgid="7136963238377062018">"röstvolym"</item>
+    <item msgid="4270236897655923007">"ringvolym"</item>
+    <item msgid="6325739889222559394">"medievolym"</item>
+    <item msgid="5762123934816216821">"alarmvolym"</item>
+    <item msgid="785049718065337473">"meddelandevolym"</item>
+    <item msgid="6700305533746877052">"bluetooth-volym"</item>
+    <item msgid="2029227495214047094">"behåll aktiv"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Plats"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Spela upp ljud"</item>
     <item msgid="136815868796597058">"Läs Urklipp"</item>
     <item msgid="5238692940326972503">"Ändra Urklipp"</item>
+    <item msgid="5753789168376302997">"Medieknappar"</item>
+    <item msgid="3265262911688671938">"Ljudinställning"</item>
+    <item msgid="2098976479485046797">"Huvudvolym"</item>
+    <item msgid="5660213838861789350">"Röstvolym"</item>
+    <item msgid="7983336752371254444">"Ringvolym"</item>
+    <item msgid="7878027809189330917">"Medievolym"</item>
+    <item msgid="7260546305036218513">"Alarmvolym"</item>
+    <item msgid="9103719301075748925">"Meddelandevolym"</item>
+    <item msgid="7025966722295861512">"Bluetooth-volym"</item>
+    <item msgid="4665183401128289653">"Behåll aktiv"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"På skärmen som rader"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Av"</item>
+    <item msgid="7688197031296835369">"Visa områden som överskrider gränsen"</item>
+    <item msgid="8332661909019981149">"Visa antal som överskrider gränsen"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgräns"</item>
     <item msgid="4071574792028999443">"Inga bakgrundsprocesser"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 66c0c3f..757d383 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ange text som ska visas på den låsta skärmen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Visa användarinfo på den låsta skärmen"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Användarinfo"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Visa profilinfo på den låsta skärmen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profilinfo"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Platsåtkomst"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Säkerhet"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ändra nätverk"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Aktivera Wi-Fi för att visa tillgängliga nätverk."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Söker efter Wi-Fi-nätverk …"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Du har inte behörighet att ändra Wi‑Fi-nätverket."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Annat nätverk …"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk installation (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Växla genom att trycka på Ctrl-Mellanslag"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tangentbordslayouter"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Användarens ordlista"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Egen ordlista"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Egna ordlistor"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Egen ordlista"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lägg till"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lägg till i ordlista"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Påverkar den talade textens ton"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Språk"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Inget språk valt"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ange språkspecifik röst för den talade texten"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Lyssna på ett exempel"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Spela upp en kort demonstration av talsyntes"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Visningar blinkar i fönster vid GPU-ritningar"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Visa maskinvaruskiktuppd."</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Låt maskinvaruskikt blinka grönt vid uppdateringar"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Visa GPU-flerlagerritning"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Från bäst till sämst: blå, grön, ljusröd, röd"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Felsök överskriden GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Inaktivera HW-överlagringar"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Använd alltid GPU för skärmsammansättning"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktivera OpenGL-spår"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Användare och profiler"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Lägg till användare eller profil"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Begränsad profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Innan du skapar en begränsad profil måste du konfigurera ett skärmlås för att skydda dina appar och personliga data."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Konfigurera lås"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Inte konfigurerad"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Profilen har inte konfigurerats – begränsad profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Ägare"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Smeknamn"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Lägg till"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Användare har egna appar och eget innehåll"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Begränsade profiler har bara åtkomst till appar och innehåll från dina konton"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Du kan begränsa åtkomsten till appar och innehåll i ditt konto"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Användare"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begränsad profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Lägg till en ny användare"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Inte nu"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Det är bara surfplattans ägare som kan hantera användare."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Det är bara mobilens ägare som kan hantera användare."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Begränsade profiler kan inte lägga till konton"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Ta bort <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Ny användare"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Ny profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vill du ta bort dig själv?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Ta bort användaren?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Vill du ta bort profilen?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Ditt utrymme och dina data tas bort från surfplattan. Det går inte att ångra den här åtgärden."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Ditt utrymme och dina data tas bort från mobilen. Det går inte att ångra den här åtgärden."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Användarens utrymme och data tas bort från surfplattan. Det går inte att ångra den här åtgärden."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Användarens utrymme och data tas bort från mobilen. Det går inte att ångra den här åtgärden."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Profilens utrymme och data tas bort från surfplattan. Det går inte att ångra den här åtgärden."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Profilens utrymme och data tas bort från mobilen. Det går inte att ångra den här åtgärden."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Begränsa appar och innehåll"</string>
     <string name="user_rename" msgid="8523499513614655279">"BYT NAMN"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Ange gränser för appen"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Styrs av <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Den här appen stöds inte i begränsade profiler"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Den här appen har åtkomst till dina konton"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi och mobilt"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Tillåt ändring av inställningar för Wi-Fi-och mobilt"</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 69b3ad6..ef1b5a9 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Eneo"</item>
     <item msgid="255608127647030286">"Binafsi"</item>
     <item msgid="4588829735729884491">"Utumaji ujumbe"</item>
-    <item msgid="8971765125227378270">"Kifaa"</item>
+    <item msgid="886742181977884584">"Vyombo vya Habari"</item>
+    <item msgid="7924928667052300589">"Kifaa"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"eneo lisilo laini"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"cheza sauti"</item>
     <item msgid="8374996688066472414">"soma ubao klipu"</item>
     <item msgid="3045529469061083747">"badilisha ubao klipu"</item>
+    <item msgid="5124443975763747838">"vitufe vya vyombo vya habari"</item>
+    <item msgid="4547883971364273343">"mkazo wa sauti"</item>
+    <item msgid="2603878814882344450">"sauti kuu"</item>
+    <item msgid="7136963238377062018">"kiwango cha sauti"</item>
+    <item msgid="4270236897655923007">"sauti ya mlio"</item>
+    <item msgid="6325739889222559394">"sauti ya midia"</item>
+    <item msgid="5762123934816216821">"sauti ya kengele"</item>
+    <item msgid="785049718065337473">"sauti ya arifa"</item>
+    <item msgid="6700305533746877052">"sauti ya bluetooth"</item>
+    <item msgid="2029227495214047094">"kaa chonjo"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Eneo"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Cheza sauti"</item>
     <item msgid="136815868796597058">"Soma ubao klipu"</item>
     <item msgid="5238692940326972503">"Rekebisha ubao klipu"</item>
+    <item msgid="5753789168376302997">"Vitufe vya media"</item>
+    <item msgid="3265262911688671938">"Kotovu cha sauti"</item>
+    <item msgid="2098976479485046797">"Sauti kuu"</item>
+    <item msgid="5660213838861789350">"Kiwango cha sauti"</item>
+    <item msgid="7983336752371254444">"Sauti ya mlio"</item>
+    <item msgid="7878027809189330917">"Sauti ya media"</item>
+    <item msgid="7260546305036218513">"Sauti ya kengele"</item>
+    <item msgid="9103719301075748925">"Sauti ya arifa"</item>
+    <item msgid="7025966722295861512">"Sauti ya Bluetooth"</item>
+    <item msgid="4665183401128289653">"Kaa chonjo"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Fupi"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Kwenye skrini kama mistari"</item>
     <item msgid="120512413928262547">"Katika adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Zima"</item>
+    <item msgid="7688197031296835369">"Onyesha maeneo yaliyoondolewa"</item>
+    <item msgid="8332661909019981149">"Onyesha kihesabu kilichoondolewa"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Kiwango cha wastani"</item>
     <item msgid="4071574792028999443">"Hakuna mchakato wa mandari nyuma"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d30f155..9668885 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -311,7 +311,9 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Andika maandishi ya kuonyeshwa kwenye skrini ya kufunga"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Onyesha maelezo ya mtumiaji kwenye skrini ya kufunga"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Maelezo ya mtumiaji"</string>
-    <string name="location_settings_title" msgid="4483843407328665068">"Ufikiaji eneo"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Onyesha maelezo ya wasifu kwenye skrini iliyofungwa"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Maelezo ya wasifu"</string>
+    <string name="location_settings_title" msgid="4483843407328665068">"Ufikiaji mahali"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Usalama"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Weka Mahali Pangu, fungua skrini, funga SIM kadi, funga hifadhi ya hati-tambulishi"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Weka Mahali Pangu, fungua skrini, funga hifadhi ya hati-tambulishi"</string>
@@ -319,8 +321,8 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Usimbaji fiche"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Usimbaji fiche wa kompyuta ndogo"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Simba simu"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Inahitaji PIN yenye nambari au nenosiri ili kusimbua kompyuta yako kibao kila unapoiwasha"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Inahitaji PIN yenye nambari au nenosiri ili kusimbua simu yako kila unapoiwasha"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Unahitaji PIN yenye nambari au nenosiri ili kusimbua kompyuta yako kibao kila unapoiwasha"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Unahitaji PIN yenye nambari au nenosiri ili kusimbua simu yako kila unapoiwasha"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Usimbaji fiche"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakuliwa na data yazo, vyombo vya habari na faili zingine. Ukisha simba kwenye kompyuta yako kibao, unahitaji kucharaza PIN ya nambari au nenosiri ili kuisimbua kila mara unapoiwasha. Huwezi kusimbua kompyuta yako kibao isipokuwa kwa kurejesha mipangilio ya kiwandani, na kufuta data yako yote."\n\n"Usimbaji fiche unachukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke kompyuta yako kibao kwenye chaji mpaka usimbaji fiche ukamilike. Ukiingilia mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakiwa na data yao, vyombo vya habari na faili zingine. Ukisha simba kwenye simu yako, unahitaji kucharaza PIN ya nambari au nenosiri ili kuisimbua kila mara unapoiwasha. Huwezi kusimbua simu yako isipokuwa kwa kurejesha mipangilio ya kiwandani,na kufuta data yako yote"\n\n"Usimbaji fiche huchukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke simu yako kwenye chaji mpaka usimbaji fiche ukamilike. Ukiingilia mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
@@ -410,13 +412,13 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Usimamizi wa kifaa"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Wasimamizi wa kifaa"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Angalia au uzime wasimamizi wa kifaa"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Ufikiaji wa arifa"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"Kufikia arifa"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Programu haziwezi kusoma arifa"</string>
   <plurals name="manage_notification_access_summary_nonzero">
     <item quantity="one" msgid="8344183614159211585">"Programu %d inaweza kusoma arifa"</item>
     <item quantity="other" msgid="980049191810249052">"Programu %d zinaweza kusoma arifa"</item>
   </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Hakuna visikilizaji vya arifa vimesakinishwa."</string>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Hakuna visikilizaji vya arifa vilivyosakinishwa."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Je, unataka kuwezesha <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> itaweza kusoma arifa zote zilizochapishwa na mfumo au programu yoyote iliyosakinishwa, inayoweza kujumuisha maelezo ya binafsi kama vile majina ya anwani na maandishi ya ujumbe uliotumwa kwako. Pia itaweza kukataa arifa hizi au kugusa vitufe vya kutenda ndani yake."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
@@ -541,13 +543,13 @@
     <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 ambao hauna muunganisho mzuri wa Intaneti"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Kuangalia mitandao kunapatikana wakati wote"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Angalia Mitandao Inayopatikana"</string>
     <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Ruhusu huduma ya Google ya kutambua eneo na programu zingine ziangalie mitandao inayopatikana, hata wakati Wi-Fi imezimwa"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sakinisha vyeti"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Ili kuboresha usahihi wa eneo na kwa ajili ya madhumuni mengine, Google na programu nyingine huchanganua kutafuta mitandao iliyokaribu, hata wakati Wi-Fi imezimwa. Ikiwa hutaki hili litokee, nenda kwenye &gt; Uchanganuzi Mahiri unapatikana wakati wote."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Programu zinaweza kuchanganua kutafuta mitandao iliyokaribu, hata wakati Wi-Fi imezimwa. Ikiwa hutaki hili litokee, nenda kwenye &gt; Uchanganuzi Mahiri unapatikana wakati wote."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Usionyeshe tena"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Acha Wi-Fi  ikiwa imewashwa wakati wa kulala"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Washa Wi-Fi wakati wa kulala"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kulikuwa na hitilafu wakati wa kubadilisha mipangilio"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Uboreshaji wa Wi-Fi"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Punguza matumizi ya betri wakati Wi-Fi imewashwa"</string>
@@ -564,8 +566,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Mtandao umerekebishwa"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ili kutazama mitandao inayopatikana, washa Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Inatafuta mitandao ya Wi-Fi..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Huna ruhusa ya kubadilisha mtandao wa Wi -Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Mtandao mwingine..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Zaidi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Usanidi kiotomatiki (WPS)"</string>
@@ -611,7 +612,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Umelindwa kwa <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", umelindwa kwa <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_turnon_message" msgid="203123538572122989">"Ili kuboresha usahihi wa mahali na kwa madhumuni mengine, <xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha ukaguaji mitandao, hata wakati Wi-Fi imezimwa."\n\n"Je, ungependa kuruhusu programu zote ambazo zingependa kukagua ziweza kufanya hivyo?"</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>
@@ -651,8 +652,8 @@
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Kumbuka muunganisho huu"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Tafuta vifaa"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Inatafuta…"</string>
-    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Pea kifaa jina jipya"</string>
-    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Vifaa shiriki"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Badilisha jina la kifaa"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Vifaa vinavyoshirikiana"</string>
     <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Vikundi vinavyokumbukwa"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Haikuweza kuunganisha."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Imeshindwa kubadili jina la kifaa."</string>
@@ -664,10 +665,10 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Sahau kikundi hiki?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Sambaza intaneti ya Wi-Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Inawezesha mtandao-hewa…"</string>
-    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Inalemaza mtandao-hewa…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Inazima intaneti..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mtandao-hewa unaobebwa wa <xliff:g id="NETWORK_SSID">%1$s</xliff:g> unafanya kazi"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Hitilafu katika kusambaza intaneti ya WiFi"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Sanidi mtandao-hewa wa Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Weka intaneti ya Wi-Fi ya kusambazwa"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> intaneti ya Wi-Fi ya kusambazwa"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skrini"</string>
@@ -751,7 +752,7 @@
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Kufunga SIM kadi"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Funga SIM kadi"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Inahitaji PIN ili kutumia kompyuta ndogo"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Inahitaji PIN ili kutumia simu"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Unahitaji PIN ili utumie simu"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Inahitaji PIN ili kutumia kompyuta ndogo"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN iwe sharti ili kutumia simu"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Badilisha PIN ya SIM"</string>
@@ -837,8 +838,8 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Futa kadi ya SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Futa data yote kwenye hifadhi ya ndani ya USB, kama vile muziki na picha"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Futa data yote kwenye kadi ya SD, kama vile muziki na picha"</string>
-    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Futa data ya kache?"</string>
-    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Hii itafuta data yote ya kache kwa programu zote."</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Ungependa kufuta data iliyo kwenye akiba?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Hii itafuta data iliyo kwenye akiba ya programu zote."</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Kitendaji cha MTP au PTP ni amilifu"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Angua hifadhi ya USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Ondoa kadi ya SD?"</string>
@@ -906,12 +907,12 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"Inarejeza mipangilio mbadala ya APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Rudisha kwenye chaguo-msingi"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Kuweka upya kwa mipangilio mbadala ya APN kumekamilika"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Rejesha kwa data ya kiwandani"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"Rejesha data ya kiwandani"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Futa data yote kwenye kompyuta ndoto"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Inafuta data yote katika simu"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hii itafuta data zote kutoka kes hifadhi yako "<b>" ndani ya kompyuta ndogo"</b>", pamoja  na: "\n" "\n" "<li>" Google Account yako "</li>" "\n" "<li>" Mfumo na programu ya data na mipangilio "</li>" "\n" "<li>"programu Zilizopakuliwa "</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hii itafuta data zote kutoka kes hifadhi yako "<b>" ndani ya kompyuta ndogo"</b>", pamoja na: "\n" "\n" "<li>" Google Account yako "</li>" "\n" "<li>" Mfumo na programu ya data na mipangilio "</li>" "\n" "<li>"programu Zilizopakuliwa "</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zinazofuata:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya kompyuta kibao"</b>", pamoja na:"\n" "\n" "<li>" Akaunti yako ya Google"</li>" "\n" "<li>"Data na mipangilio ya mfumo na programu"</li>" "\n" "<li>"Programu zilizopakuliwa"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya simu"</b>", pamoja na:"\n" "\n" "<li>"Akaunti yako ya Google"</li>" "\n" "<li>"Data na mipangilio ya mfumo na programu"</li>" "\n" "<li>"programu zilizopakuliwa"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zifuatazo:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziki"</li>\n<li>"Picha"</li>\n<li>"data nyingine ya mtumiaji"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>" hifadhi ya "</b>" inahitaji kufutwa."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ili kufuta muziki, picha, na data zingine za mtumiaji, "<b>"kadi ya"</b>" inahitaji kufutwa."</string>
@@ -921,12 +922,12 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Futa data zote kwenye kadi ya SD, kama vile muziki au picha."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Weka upya kompyuta ndogo"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Rejesha mipangilio ya mwanzoni ya simu"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Futa taarifa zako zote za kibinafsi na zilizopakuliwa? Hauwei kutengua hatua hii!"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"Ungependa kufuta taarifa zako zote za kibinafsi na zilizopakuliwa? Hauwei kutendua hatua hii!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Futa kila kitu"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Mchoro wa kufungua"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Unahitaji kuchora mchoro wa kufungua ili kuthibitisha kurejesha mipangilio ya kiwandani."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Hakuna mpangilio mpya uliofanywa kwa sababu huduma ya Mfumo wa Kufuta haipatikani."</string>
-    <string name="master_clear_confirm_title" msgid="7572642091599403668">"Seti upya?"</string>
+    <string name="master_clear_confirm_title" msgid="7572642091599403668">"Iwekwe upya?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Futa hifadhi ya USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Futa kadi ya SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Hufuta data yote katika hifadhi ya USB"</string>
@@ -971,7 +972,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mitandao ya simu"</string>
     <string name="location_title" msgid="1029961368397484576">"Mahali pangu"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Eneo la mtandao wa Wi-Fi na wa simu"</string>
-    <string name="location_neighborhood_level" msgid="5626515380188353712">"Ruhusu programu zitumie huduma ya eneo ya Google ili kukadiria eneo lako kwa haraka. Data ya eneo lisilojulikana itakusanywa na kutumwa kwa Google."</string>
+    <string name="location_neighborhood_level" msgid="5626515380188353712">"Ruhusu programu zitumie huduma ya Google ya kukadiria mahali ili kukadiria mahali ulipo kwa haraka. Data ya mahali pasipojulikana itakusanywa na kutumwa kwa Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Eneo limethibitishwa na Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Setileti za GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Ruhusu programu zitumie GPS kwenye kompyuta yako kibao ili kutambua mahali ulipo"</string>
@@ -1033,7 +1034,7 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Lazima uchore umbo kufungua skrini"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Fanya mchoro uonekane"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Iteteme inapoguswa"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Kitufe cha kuwasha/kuzima hufunga papo hapo"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Zima kwa kitufe cha nishati"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Weka mchoro wa kufungua"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Badilisha umbo la kufungua"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Jinsi ya kuchora mchoro wa kufungua"</string>
@@ -1055,15 +1056,15 @@
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Wezesha chaguo zaidi ya mipangilio."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Maelezo ya programu"</string>
     <string name="storage_label" msgid="8700867073480107253">"Hifadhi"</string>
-    <string name="auto_launch_label" msgid="3012617472833815382">"Zindua kwa chaguo-msingi"</string>
+    <string name="auto_launch_label" msgid="3012617472833815382">"Zindua kama chaguo-msingi"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Chaguo-msingi"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Utangamanifu wa skrini"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Idhini"</string>
-    <string name="cache_header_label" msgid="1877197634162461830">"kache"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Futa kache"</string>
-    <string name="cache_size_label" msgid="7505481393108282913">"kache"</string>
+    <string name="cache_header_label" msgid="1877197634162461830">"Akiba"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Futa akiba"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"Akiba"</string>
     <string name="controls_label" msgid="7611113077086853799">"Vidhibiti"</string>
-    <string name="force_stop" msgid="7435006169872876756">"Lazimisha komesha"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Komesha kwa lazima"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Jumla"</string>
     <string name="application_size_label" msgid="8494609207373874267">"Programu"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"Programu ya hifadhi ya USB"</string>
@@ -1121,7 +1122,7 @@
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Futa data"</string>
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Haikuweza kufuta data ya programu."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Programu hii haiwezi kufikia inayofuata kwa kompyuta yako ndogo:"</string>
-    <string name="security_settings_desc" product="default" msgid="61749028818785244">"Programu hii ya kompyuta inaweza kufikia ifuatayo kwenye simu yako:"</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"Programu hii inaweza kufikia yafuatayo kwenye simu yako:"</string>
     <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Programu hii inaweza kufikia yafuatayo kwenye kompyuta yako kibao. Ili kuboresha utendaji na kupunguza matumizi ya kumbukumbu, baadhi ya vibali hivi vinapatikana katika <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> kwa sababu vinaendeshwa kwa mchakato sawa na <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Programu hii inaweza kufikia yafuatayo kwenye simu yako. Ili kuboresha utendaji na kupunguza matumizi ya kumbukumbu, baadhi ya vibali hivi vinapatikana katika <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> kwa sababu vinaendeshwa kwa mchakato sawa na <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> na  <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
@@ -1170,8 +1171,8 @@
     <string name="service_started_by_app" msgid="818675099014723551">"Imeanzishwa na programu."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> hazijatumiwa"</string>
-    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> zimetumiwa"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> hujatumia"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"Umetumia <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
@@ -1200,7 +1201,7 @@
     <string name="language_settings" msgid="5292716747264442359">"Lugha, Kibodi na Sauti"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Lugha, Kibodi na Sauti"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Mipangilio ya lugha"</string>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"Kibodi &amp; mbinu za kuingizia"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"Kibodi na mbinu za kuingiza hoja"</string>
     <string name="phone_language" msgid="8870144109924299673">"Lugha"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Weka mibadala kiotomatiki"</string>
@@ -1226,9 +1227,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Ili kubadili, bonyeza Dhibiti-Kiweka nafasi"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Chaguo-msingi"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Mpangilio wa kibodi"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamusi ya mtumiaji"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamusi binafsi"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"kamusi binafsi"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Kamusi binafsi"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Ongeza"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Ongeza kwenye kamusi"</string>
@@ -1284,10 +1283,10 @@
     <string name="development_settings_not_available" msgid="4308569041701535607">"Chaguo la Wasanidi programu halipatikani kwa mtumiaji huyu"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Utatuzi wa USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Muundo wa kurekebisha wakati USB imeunganishwa"</string>
-    <string name="clear_adb_keys" msgid="4038889221503122743">"Ubatilishaji wa idhini za urekebishaji wa USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Batilisha idhini za kurekebisha USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Ripoti za hitilafu za menyu ya nguvu"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Jumuisha chaguo katika menyu ya nguvu kwa kupeleka ripoti ya hitilafu"</string>
-    <string name="keep_screen_on" msgid="1146389631208760344">"Kaa ange"</string>
+    <string name="keep_screen_on" msgid="1146389631208760344">"Weka skrini ikiwa imewashwa"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrini haitawahi kuzima wakati unachaji"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ruhusu maeneo ya jaribio"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Ruhusu maeneo ya majaribio"</string>
@@ -1308,7 +1307,7 @@
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wakati kadi ya SD imelindwa, sharti programu ziombe ruhusa ya kusoma data kutoka kwenye hifadhi ya nje."\n\n"Baadhi ya programu zinawezakosa kufanya kazi hadi zisasishwe na wasanidi wake."</string>
     <string name="enable_terminal_title" msgid="95572094356054120">"Kituo cha karibu"</string>
     <string name="enable_terminal_summary" msgid="67667852659359206">"Washa programu ya mwisho inayotoa ufikiaji mkuu wa karibu"</string>
-    <string name="gadget_picker_title" msgid="98374951396755811">"Chagua kidude"</string>
+    <string name="gadget_picker_title" msgid="98374951396755811">"Chagua kitufe"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Chagua wijeti"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Unda wijeti na uruhusu ufikiaji?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Baada ya kuunda wijeti, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> inaweza kufikia data yote inayoonyeshwa."</string>
@@ -1347,7 +1346,7 @@
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> inahitaji:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Chunguza vitendo vyako"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Pokea arifa unapoingiliana na programu."</string>
-    <string name="disable_service_title" msgid="3624005212728512896">"Je, ungependa kucha <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Ungependa kuzima <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Kugusa Sawa kutasimamisha <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hakuna huduma zilizosanidiwa"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Unahitaji msomaji wa skrini?"</string>
@@ -1399,7 +1398,7 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Washa saa"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Muda bila mawimbi"</string>
-    <string name="battery_action_stop" msgid="649958863744041872">"Lazimisha komesha"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Komesha kwa lazima"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Taarifa ya programu"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Mipangilio ya App"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Mipangilio"</string>
@@ -1437,22 +1436,23 @@
     <string name="recognizer_settings_title" msgid="432493301215113154">"Tafuta kwa kuzungumza"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Mipangilio ya\"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Mipangilio ya maandishi kwa hotuba"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Matokeo ya matini-hotuba"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"Kubadilisha maandishi hadi usemi"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Tumia mipangilio yangu kila wakati"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Mipangilio mbadala ya hapa chini inafuta mipangilio ya programu"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Mipangilio ya chaguo-msingi"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Injini mbadala"</string>
     <string name="tts_default_synth_summary" msgid="6482936537135251690">"Inaweka injini ya hotumba ya mwondoko kwa kutumiwa na maandishi yaliyotamkwa"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Kiwango cha usemaji"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kasi ya kutamkwa kwa maandishi"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kasi ya kutamkwa kwa maneno"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Giza"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Huadhiri hali ya maandishi yaliyosemwa"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Lugha"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Huweka sauti maalum ya lugha kwa maandishi yanayozungumzwa"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Lugha haijachaguliwa"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Huweka sauti maalum ya lugha inayolingana na yanayozungumzwa"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Sikiliza mfano"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Cheza onyesho fupi la usanisi usemaji"</string>
     <string name="tts_install_data_title" msgid="4264378440508149986">"Sakinisha data ya sauti"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Sakinisha data ya sauti inayohitajika kwa usanidi usemaji"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Sakinisha data ya sauti inayohitajika kuunganisha usemi"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Sauti zinazohitajika kwa usanisi wa usemaji tayari zimesakinishwa vizuri"</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Mipangilio yako imebadilika. Huu ni mfano wa jinsi inavyosikika."</string>
     <string name="tts_engine_error" msgid="3305141107104670703">"Injini uliyochagua haiwezi kuendeshwa."</string>
@@ -1522,8 +1522,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Unahitaji kuweka PIN ya kufunga skrini au nenosiri kabla ya kutumia hifadhi ya hati."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Mlio wa dharura"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Weka tabia wakati simu ya dharura imepigwa"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"Kuweka nakala na kuweka mipangilio upya"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"Kuweka nakala na kuweka mipangilio upya"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Hifadhi nakala na urejeshe mipangilio ya kiwanda"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Hifadhi nakala na urejeshe mipangilio ya kiwanda"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Hifadhi nakala rudufu na urejeshe"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Data za kibinafsi"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Hifadhi nakala ya data yangu"</string>
@@ -1532,8 +1532,8 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Hakuna akaunti inayohifadhi kwa sasa data iliyochelezwa"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Onyesha upya otomatiki"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Wakati wa kusanidi upya programu, rejesha mipangilio na data ambazo zina nakala rudufu"</string>
-    <string name="local_backup_password_title" msgid="3860471654439418822">"Nenosiri la chelezo ya eneo kazi"</string>
-    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Chelezo kamili za eneo kazi hazijalindwa kwa sasa"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Nenosiri la hifadhi rudufu ya eneo kazi"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Hifadhi rudufu kamili za eneo kazi hazijalindwa kwa sasa"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Gusa ili kubadilisha au kuondoa nenosiri la chelezo kamili za eneo kazi"</string>
     <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nenosiri mpya la chelezo limewekwa"</string>
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Nenosiri jipya na uthibitisho havioani"</string>
@@ -1545,7 +1545,7 @@
     <string name="remove_device_admin" msgid="3596845261596451437">"Zima"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Wasimamizi wa kifaa"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Hakuna wasimamizi kifaa wanaopatikana"</string>
-    <string name="add_device_admin_msg" msgid="6246742476064507965">"Amilisha usimamizi wa kifaa?"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"Ungependa kuwasha usimamizi wa kifaa?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Washa"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Msimamizi wa kifaa"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Uamilishaji wa msimamizi itaruhusu programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> kufanya  uendeshi unaofuata:"</string>
@@ -1664,8 +1664,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Kiwango cha maoni ndani ya madirisha wakati yanatolewa na GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Onyesha sasisho za safu za maunzi"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Angaza kijani safu za maunzi zinaposasisha"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Onyesha utoaji zaidi wa GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Kutoka kwa bora hadi mbovu zaidi: samawati, kijani, nyekundu hafifu, nyekundu"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Tatua uondoaji wa GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Lemaza miekeleo ya HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Daima tumia GPU kwa mchanganyiko wa skrini"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Wezesha ufuatiliaji wa OpenGL"</string>
@@ -1679,7 +1678,7 @@
     <string name="force_msaa_summary" msgid="9123553203895817537">"Wezesha 4x MSAA katika programu za OpenGL ES 2.0"</string>
     <string name="show_non_rect_clip" msgid="505954950474595172">"Tatua uendeshaji wa klipu usio mstatili"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Utungilizaji wa GPU ya wasifu"</string>
-    <string name="window_animation_scale_title" msgid="6162587588166114700">"Kipimo cha uhiani wa Window"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Uhuishaji kwenye dirisha"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Mageuzi ya kipimo cha huiani"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Mizani ya muda wa uhuishaji"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Iga maonyesho ya upili"</string>
@@ -1770,7 +1769,7 @@
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Cheti cha mtumiaji cha IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Cheti cha IPSec CA"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Cheti cha seva cha IPSec"</string>
-    <string name="vpn_show_options" msgid="7182688955890457003">"Onyesha chaguo za kindani"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Onyesha chaguo za kina"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Vikoa vya utafutaji DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Seva ya DNS(mfano 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"Njia za usambazaji (mfano 10.0.0.0 / 8)"</string>
@@ -1817,44 +1816,42 @@
     <string name="user_settings_title" msgid="6151874007858148344">"Watumiaji"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Watumiaji na wasifu"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Ongeza mtumiaji au wasifu"</string>
-    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Wasifu uliopigwa marufuku"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Wasifu uliozuiwa"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Kabla uunde wasifu uliowekekwa vikwazo, utahitajika kuweka skrini iliyofungwa ili kulinda programu zako na data binafsi."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Weka ufunguo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Haijasanidiwa"</string>
-    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Haujasanidiwa - Wasifu uliopigwa marufuku"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Hajauweka - Wasifu uliozuiwa"</string>
     <string name="user_owner" msgid="3879126011135546571">"Mmiliki"</string>
     <string name="user_you" msgid="1639158809315025986">"Wewe (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Jina la utani"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Ongeza"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Watumiaji wana programu na maudhui yao binafsi"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Wasifu uliopigwa marufuku unaweza tu kufikia programu na maudhui kutoka kwenye akaunti zako"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Unaweza kuwekea programu na maudhui vizuizi kutoka kwenye akaunti yako"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Mtumiaji"</string>
-    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Wasifu uliopigwa marufuku"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Wasifu uliozuiwa"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Ongeza mtumiaji mpya"</string>
     <string name="user_add_user_message_long" msgid="3086244205384741788">"Unaweza kushiriki kifaa hiki na watu wengine kwa kuweka watumiaji wa ziada. Kila mtumiaji ana nafasi yake binafsi, ambayo anaweza kugeuza kumfaa kwa programu binafsi, pazia, na kadhalika. Watumiaji pia wanaweza kurekebisha mipangilio ya kompyuta ndogo kama Wi-Fi ambayo inaathiri kila mtu."\n\n"Baada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi."\n\n"Mtumiaji yeyote anaweza kukubali idhini zilizosasishwa za programu kwa niaba ya watumiaji wengine wote."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Baada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi."\n\n"Mtumiaji yeyote anaweza kukubali ruhusa zilizosasishwa za programu kwa niaba ya watumiaji wengine wote."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Sandi mtumiaji sasa?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Hakikisha kuwa mtu wa kuchukua kompyuta ndogo na kusanidi nafasi yake yupo"</string>
-    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Je, ungependa kusanidi wasifu sasa?"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Ungependa kuweka wasifu sasa?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Sanidi sasa"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Siyo sasa"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Mmiliki wa kompyuta ndogo pekee ndiye anayeweza kudhibiti watumiaji."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Mmiliki wa simu pekee ndiye anayeweza kudhibiti watumiaji."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Wasifu zilizodhibitiwa haziwezi kuongeza akaunti"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Futa <xliff:g id="USER_NAME">%1$s</xliff:g> kutoka kwenye kifaa hiki"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Mtumiaji mpya"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Wasifu mpya"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Futa mwenyewe?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Je, mtumiaji aondolewe?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Je, ungependa kuondoa wasifu?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Utapoteza nafasi na data yako kwenye kompyuta hii ndogo. Huwezi kutendua kitendo hiki."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Utapoteza nafasi na data yako kwenye simu hii. Huwezi kutendua kitendo hiki."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Nafasi hii ya mtumiaji na data zitatoweka katika kompyuta hii ndogo. Huwezi kutendua kitendo hiki."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Nafasi hii ya mtumiaji na data zitatoweka katika simu hii. Huwezi kutendua kitendo hiki."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Nafasi na data ya wasifu huu zitatoweka kwenye kompyuta hii kibao. Huwezi kutendua kitendo hiki."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Nafasi na data ya wasifu huu zitatoweka kwenye simu hii. Huwezi kutendua kitendo hiki."</string>
     <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>
@@ -1871,12 +1868,11 @@
     <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>
-    <string name="user_restrictions_title" msgid="371835484894400390">"Ruhusu programu na maudhui"</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Vizuizi vya programu na maudhui"</string>
     <string name="user_rename" msgid="8523499513614655279">"BADILISHA JINA"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Weka mipaka ya programu"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Inadhibitiwa na <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Programu hii haitumiki katika wasifu zilizowekewa vikwazo"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Programu hii inaweza kufikia akaunti zako"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi na Vifaa vya Mkononi"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Ruhusu marekebisho ya mipangilio ya Wi‑Fi na Vifaa vya Mkononi"</string>
@@ -1891,6 +1887,6 @@
     <string name="wizard_next" msgid="3606212602795100640">"Inayofuata"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"Maliza"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"Piga picha"</string>
-    <string name="user_image_choose_photo" msgid="7940990613897477057">"Chagua picha kutoka kwenye Ghala"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Chagua picha kutoka Matunzio"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 324463d..1377939 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"ตำแหน่งที่ตั้ง"</item>
     <item msgid="255608127647030286">"ส่วนตัว"</item>
     <item msgid="4588829735729884491">"การรับส่งข้อความ"</item>
-    <item msgid="8971765125227378270">"อุปกรณ์"</item>
+    <item msgid="886742181977884584">"สื่อ"</item>
+    <item msgid="7924928667052300589">"อุปกรณ์"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ตำแหน่งคร่าวๆ"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"เล่นเสียง"</item>
     <item msgid="8374996688066472414">"อ่านคลิปบอร์ด"</item>
     <item msgid="3045529469061083747">"แก้ไขคลิปบอร์ด"</item>
+    <item msgid="5124443975763747838">"ปุ่มสื่อ"</item>
+    <item msgid="4547883971364273343">"โฟกัสอัตโนมัติ"</item>
+    <item msgid="2603878814882344450">"ระดับเสียงหลัก"</item>
+    <item msgid="7136963238377062018">"ระดับเสียงสนทนา"</item>
+    <item msgid="4270236897655923007">"ระดับเสียงเรียกเข้า"</item>
+    <item msgid="6325739889222559394">"ระดับเสียงของสื่อ"</item>
+    <item msgid="5762123934816216821">"ระดับเสียงปลุก"</item>
+    <item msgid="785049718065337473">"ระดับเสียงการแจ้งเตือน"</item>
+    <item msgid="6700305533746877052">"ระดับเสียงบลูทูธ"</item>
+    <item msgid="2029227495214047094">"ทำงานตลอดเวลา"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ตำแหน่ง"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"เล่นเสียง"</item>
     <item msgid="136815868796597058">"อ่านคลิปบอร์ด"</item>
     <item msgid="5238692940326972503">"แก้ไขคลิปบอร์ด"</item>
+    <item msgid="5753789168376302997">"ปุ่มสื่อ"</item>
+    <item msgid="3265262911688671938">"โฟกัสอัตโนมัติ"</item>
+    <item msgid="2098976479485046797">"ระดับเสียงหลัก"</item>
+    <item msgid="5660213838861789350">"ระดับเสียงสนทนา"</item>
+    <item msgid="7983336752371254444">"ระดับเสียงเรียกเข้า"</item>
+    <item msgid="7878027809189330917">"ระดับเสียงของสื่อ"</item>
+    <item msgid="7260546305036218513">"ระดับเสียงปลุก"</item>
+    <item msgid="9103719301075748925">"ระดับเสียงของการแจ้งเตือน"</item>
+    <item msgid="7025966722295861512">"ระดับบลูทูธ"</item>
+    <item msgid="4665183401128289653">"ทำงานตลอดเวลา"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"สั้น"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"เป็นเส้นบนหน้าจอ"</item>
     <item msgid="120512413928262547">"ใน adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"ปิด"</item>
+    <item msgid="7688197031296835369">"แสดงพื้นที่การวาดทับ"</item>
+    <item msgid="8332661909019981149">"แสดงตัวนับการวาดทับ"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"ขีดจำกัดมาตรฐาน"</item>
     <item msgid="4071574792028999443">"ไม่มีกระบวนการพื้นหลัง"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 6b863de..5cb1b38 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"พิมพ์ข้อความที่ต้องการให้แสดงบนหน้าจอล็อก"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"แสดงข้อมูลผู้ใช้บนหน้าจอล็อก"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"ข้อมูลผู้ใช้"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"แสดงข้อมูลโปรไฟล์บนหน้าจอล็อก"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"ข้อมูลโปรไฟล์"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"การเข้าถึงตำแหน่ง"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"ความปลอดภัย"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
@@ -552,8 +554,8 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"ใช้การสแกนได้เสมอ"</string>
     <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"ให้บริการตำแหน่งของ Google และแอปอื่นๆ สแกนหาเครือข่ายได้ แม้ในขณะที่ WiFi ปิดอยู่"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ติดตั้งใบรับรอง"</string>
-    <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_text_location_on" msgid="8135076005488914200">"เพื่อปรับปรุงความแม่นยำของตำแหน่งและเพื่อวัตถุประสงค์อื่น Google และแอปอื่นๆ อาจสแกนหาเครือข่ายใกล้เคียงแม้ในเวลาที่ปิด WiFi หากคุณไม่ต้องการให้สิ่งนี้เกิดขึ้น ให้ไปที่ ขั้นสูง &gt; การสแกนพร้อมใช้งานตลอดเวลา"</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"แอปอาจสแกนหาเครือข่ายใกล้เคียง แม้ในเวลาที่ปิด WiFi หากคุณไม่ต้องการให้สิ่งนี้เกิดขึ้น ให้ไปที่ ขั้นสูง &gt; การสแกนพร้อมใช้งานตลอดเวลา"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"ไม่ต้องแสดงข้อความนี้อีก"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"เปิด WiFi ระหว่างที่อยู่ในโหมดสลีป"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"มีปัญหาในการเปลี่ยนแปลงการตั้งค่า"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"แก้ไขเครือข่าย"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"หากต้องการดูเครือข่ายที่ใช้ได้ ให้เปิด WiFi"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"กำลังค้นหาเครือข่าย WiFi…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"คุณไม่ได้รับอนุญาตให้เปลี่ยนแปลงเครือข่าย WiFi"</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"เครือข่ายอื่น…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"เพิ่มเติม"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"การตั้งค่าอัตโนมัติ (WPS)"</string>
@@ -619,7 +620,7 @@
     <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_turnon_message" msgid="203123538572122989">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง และเพื่อวัตถุประสงค์อื่น ๆ <xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการเปิดการสแกนเครือข่าย แม้ในขณะที่ไม่มี WiFi "\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>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"หากต้องการสลับ กด Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ค่าเริ่มต้น"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"รูปแบบแป้นพิมพ์"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"พจนานุกรมของผู้ใช้"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"พจนานุกรมส่วนบุคคล"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"พจนานุกรมส่วนบุคคล"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"พจนานุกรมส่วนตัว"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"เพิ่ม"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"เพิ่มลงในพจนานุกรม"</string>
@@ -1355,7 +1354,7 @@
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ต้องการที่จะ"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"สังเกตการทำงานของคุณ"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"รับการแจ้งเตือนเมื่อคุณกำลังโต้ตอบกับแอปหนึ่ง"</string>
-    <string name="disable_service_title" msgid="3624005212728512896">"หยุด <xliff:g id="SERVICE">%1$s</xliff:g> หรือไม่"</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"หยุด <xliff:g id="SERVICE">%1$s</xliff:g> ไหม"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"การแตะ \"ตกลง\" จะเป็นการหยุด <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ไม่ได้ติดตั้งบริการใดไว้"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"ต้องใช้โปรแกรมอ่านหน้าจอหรือไม่"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ความสูง-ต่ำของเสียง"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"มีผลต่อโทนเสียงของข้อความที่พูด"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"ภาษา"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ไม่ได้เลือกภาษา"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"ตั้งค่าเสียงในภาษาที่ระบุสำหรับข้อความที่ได้ยิน"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"ฟังตัวอย่าง"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"เล่นการสาธิตสั้นๆ เกี่ยวกับการสังเคราะห์เสียง"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"แฟลชมุมมองภายในหน้าต่างเมื่อวาดด้วย GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"แสดงอัปเดตเลเยอร์ฮาร์ดแวร์"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"เลเยอร์ฮาร์ดแวร์กะพริบเป็นสีเขียวเมื่อมีการอัปเดต"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"แสดงการใช้ GPU มากเกินไป"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"จากดีที่สุดไปหาแย่ที่สุด: ฟ้า เขียว แดงอ่อน แดง"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"ดีบักการวาดทับ GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"ปิดใช้งานการวางซ้อน HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ใช้ GPU ในการจัดวางองค์ประกอบหน้าจอเสมอ"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"เปิดใช้ร่องรอยใน OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"ผู้ใช้และโปรไฟล์"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"เพิ่มผู้ใช้หรือโปรไฟล์"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"โปรไฟล์ที่ถูกจำกัด"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"ก่อนที่คุณจะสามารถสร้างโปรไฟล์ที่ถูกจำกัดได้ คุณจะต้องตั้งค่าล็อกหน้าจอเพื่อปกป้องแอปและข้อมูลส่วนตัวของคุณ"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"ตั้งค่าล็อก"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"ไม่ได้ตั้งค่า"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"ไม่ได้ตั้งค่า - โปรไฟล์ที่ถูกจำกัด"</string>
     <string name="user_owner" msgid="3879126011135546571">"เจ้าของ"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"ชื่อเล่น"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"เพิ่ม"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"ผู้ใช้มีแอปและเนื้อหาของตัวเอง"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"โปรไฟล์ที่ถูกจำกัดสามารถเข้าถึงเฉพาะแอปและเนื้อหาจากบัญชีของคุณเท่านั้น"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"คุณสามารถจำกัดการเข้าถึงแอปและเนื้อหาจากบัญชีของคุณได้"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ผู้ใช้"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"โปรไฟล์ที่ถูกจำกัด"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"เพิ่มผู้ใช้ใหม่"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"ข้ามไปก่อน"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"เฉพาะเจ้าของแท็บเล็ตเท่านั้นที่สามารถจัดการผู้ใช้ได้"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"เฉพาะเจ้าของโทรศัพท์เท่านั้นที่สามารถจัดการผู้ใช้ได้"</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"โปรไฟล์ที่ถูกจำกัดไม่สามารถเพิ่มบัญชีได้"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"ลบ <xliff:g id="USER_NAME">%1$s</xliff:g> จากอุปกรณ์นี้"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"ผู้ใช้ใหม่"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"โปรไฟล์ใหม่"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"ลบตัวคุณเองหรือไม่"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"นำผู้ใช้ออกหรือไม่"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"หากต้องการลบโปรไฟล์"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"พื้นที่และข้อมูลของคุณที่อยู่ในแท็บเล็ตเครื่องนี้จะหายไป คุณไม่สามารถเลิกทำการทำงานนี้"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"พื้นที่และข้อมูลของคุณที่อยู่ในโทรศัพท์เครื่องนี้จะหายไป คุณไม่สามารถเลิกทำการทำงานนี้"</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"พื้นที่และข้อมูลของผู้ใช้รายนี้จะหายไปจากแท็บเล็ตเครื่องนี้ คุณไม่สามารถเลิกทำการทำงานนี้"</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"พื้นที่และข้อมูลของผู้ใช้รายนี้จะหายไปจากโทรศัพท์เครื่องนี้ คุณไม่สามารถเลิกทำการทำงานนี้"</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"พื้นที่และข้อมูลของโปรไฟล์นี้จะหายไปจากแท็บเล็ตเครื่องนี้ คุณไม่สามารถยกเลิกการทำงานนี้"</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"พื้นที่และข้อมูลของโปรไฟล์นี้จะหายไปจากโทรศัพท์เครื่องนี้ คุณไม่สามารถยกเลิกการทำงานนี้"</string>
     <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>
@@ -1879,15 +1876,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>
-    <string name="user_restrictions_title" msgid="371835484894400390">"อนุญาตแอปและเนื้อหา"</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"ข้อจำกัดแอปพลิเคชันและเนื้อหา"</string>
     <string name="user_rename" msgid="8523499513614655279">"เปลี่ยนชื่อ"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"ตั้งค่าขีดจำกัดแอปพลิเคชัน"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"ควบคุมโดย <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"แอปนี้ไม่ได้รับการสนับสนุนในโปรไฟล์ที่ถูกจำกัด"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"แอปนี้สามารถเข้าถึงบัญชีของคุณ"</string>
-    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi และมือถือ"</string>
-    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"อนุญาตให้แก้ไขการตั้งค่า Wi-Fi และมือถือ"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"WiFi และมือถือ"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"อนุญาตให้แก้ไขการตั้งค่า WiFi และมือถือ"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"บลูทูธ"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"อนุญาตให้แก้ไขการจับคู่บลูทูธและการตั้งค่า"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index bf7da47..61ea152 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Lokasyon"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Pagmemensahe"</item>
-    <item msgid="8971765125227378270">"Device"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Device"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"tinatayang lokasyon"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"i-play ang audio"</item>
     <item msgid="8374996688066472414">"basahin ang clipboard"</item>
     <item msgid="3045529469061083747">"baguhin ang clipboard"</item>
+    <item msgid="5124443975763747838">"mga button ng media"</item>
+    <item msgid="4547883971364273343">"focus ng audio"</item>
+    <item msgid="2603878814882344450">"master na volume"</item>
+    <item msgid="7136963238377062018">"volume ng boses"</item>
+    <item msgid="4270236897655923007">"volume ng ring"</item>
+    <item msgid="6325739889222559394">"volume ng media"</item>
+    <item msgid="5762123934816216821">"volume ng alarma"</item>
+    <item msgid="785049718065337473">"volume ng notification"</item>
+    <item msgid="6700305533746877052">"volume ng bluetooth"</item>
+    <item msgid="2029227495214047094">"panatilihing bukas"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokasyon"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"I-play ang audio"</item>
     <item msgid="136815868796597058">"Basahin ang clipboard"</item>
     <item msgid="5238692940326972503">"Baguhin ang clipboard"</item>
+    <item msgid="5753789168376302997">"Mga media button"</item>
+    <item msgid="3265262911688671938">"Focus ng audio"</item>
+    <item msgid="2098976479485046797">"Master volume"</item>
+    <item msgid="5660213838861789350">"Volume ng boses"</item>
+    <item msgid="7983336752371254444">"Volume ng pag-ring"</item>
+    <item msgid="7878027809189330917">"Volume ng media"</item>
+    <item msgid="7260546305036218513">"Volume ng alarm"</item>
+    <item msgid="9103719301075748925">"Volume ng notification"</item>
+    <item msgid="7025966722295861512">"Volume ng Bluetooth"</item>
+    <item msgid="4665183401128289653">"Panatilihing bukas"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Maikli"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Sa screen bilang mga linya"</item>
     <item msgid="120512413928262547">"Sa adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"I-off"</item>
+    <item msgid="7688197031296835369">"Tingnan ang mga overdraw na bahagi"</item>
+    <item msgid="8332661909019981149">"Ipakita ang overdraw na counter"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Karaniwang limitasyon"</item>
     <item msgid="4071574792028999443">"Walang mga proseso sa background"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 169b79b..49042b4 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Mag-type ng teksto upang maipakita sa lock screen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Ipakita ang impormasyon ng user sa lock screen"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Impormasyon ng user"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Ipakita ang impormasyon ng profile sa lock screen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Info ng profile"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Access sa lokasyon"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng imbakan ng kredensyal"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Baguhin ang network"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para makita ang available network, i-on ang Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Naghahanap ng mga Wi-Fi network..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Wala kang pahintulot na baguhin ang Wi‑Fi network."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Iba pang network..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Higit pa"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Awtomatikong setup (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para palit, pindot Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Mga layout ng keyboard"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diksyunaryo ng user"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personal na diksyunaryo"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personal na mga diksyunaryo"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personal na diksyunaryo"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Magdagdag"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Idagdag sa diksyunaryo"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Naaapektuhan ang tono ng tekstong sinasabi"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Wika"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Walang napiling wika"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Itinatakda ang boses na partikular sa wika para sa sinasambit na teksto"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Makinig sa isang halimbawa"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Mag-play ng maikling pagpapakita ng speech synthesis"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"I-flash ang view sa windows kapag ginuhit sa GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Pakita upd hardware layer"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"I-flash berde hardware layer pag nag-update ito"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Ipakita overdraw ng GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Maganda-di maganda: asul, berde, light red, pula"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"I-debug ang GPU overdraw"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Wag paganahin HW overlay"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Laging gamitin ang GPU para sa screen compositing"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Paganahin trace ng OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Mga user at profile"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Magdagdag ng user o profile"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Pinaghihigpitang profile"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Bago ka makakalikha ng pinaghihigpitang profile, kakailanganin mong mag-set up ng lock ng screen upang protektahan ang iyong apps at personal na data."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Itakda ang lock"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Hindi naka-set up"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Hindi naka-set up - Pinaghihigpitang profile"</string>
     <string name="user_owner" msgid="3879126011135546571">"May-ari"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Palayaw"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Idagdag"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"May sariling apps at nilalaman ang mga user"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Maa-access lang ng mga pinaghihigpitang profile ang apps at nilalaman mula sa iyong mga account"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Maaari mong paghipitan ang access sa apps at nilalaman mula sa iyong account"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"User"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Pinaghihigpitang profile"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Idagdag ang bagong user"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Huwag ngayon"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Ang may-ari lang ng tablet ang maaaring mamahala ng mga user."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Ang may-ari lang ng telepono ang maaaring mamahala ng mga user."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Hindi makakapagdagdag ng mga account sa mga pinaghihigpitang profile"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Tanggal <xliff:g id="USER_NAME">%1$s</xliff:g> dito device"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Bagong user"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Bagong profile"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Tanggalin ang iyong sarili?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Alisin ang user?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Alisin ang profile?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Mawawala mo ang iyong espasyo at data sa tablet na ito. Hindi mo maaaring i-undo ang pagkilos na ito."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Mawawala mo ang iyong espasyo at data sa teleponong ito. Hindi mo maaaring i-undo ang pagkilos na ito."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Mawawala ang espasyo at data ng user na ito sa tablet na ito. Hindi mo maaaring i-undo ang pagkilos na ito."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Mawawala ang espasyo at data ng user na ito sa teleponong ito. Hindi mo maaaring i-undo ang pagkilos na ito."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Mawawala ang espasyo at data ng profile na ito sa tablet na ito. Hindi mo maaaring i-undo ang pagkilos na ito."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Mawawala ang espasyo at data ng profile na ito sa teleponong ito. Hindi mo maaaring i-undo ang pagkilos na ito."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Mga paghihigpit sa app at nilalaman"</string>
     <string name="user_rename" msgid="8523499513614655279">"I-RENAME"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Magtakda ng limit ng application"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kinokontrol ng <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Hindi sinusuportahan ang app na ito sa mga pinaghihigpitang profile"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Maa-access ng app na ito ang iyong mga account"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi at Mobile"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Payagan ang pagbago sa mga setting ng Wi‑Fi at Mobile"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 31b15f0..37f3146 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Konum"</item>
     <item msgid="255608127647030286">"Kişisel"</item>
     <item msgid="4588829735729884491">"Mesajlaşma"</item>
-    <item msgid="8971765125227378270">"Cihaz"</item>
+    <item msgid="886742181977884584">"Medya"</item>
+    <item msgid="7924928667052300589">"Cihaz"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"yaklaşık konum"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"sesi çal"</item>
     <item msgid="8374996688066472414">"panoyu oku"</item>
     <item msgid="3045529469061083747">"panoyu değiştir"</item>
+    <item msgid="5124443975763747838">"medya düğmeleri"</item>
+    <item msgid="4547883971364273343">"ses odağı"</item>
+    <item msgid="2603878814882344450">"ana ses düzeyi"</item>
+    <item msgid="7136963238377062018">"konuşma sesi düzeyi"</item>
+    <item msgid="4270236897655923007">"çalma sesi düzeyi"</item>
+    <item msgid="6325739889222559394">"medya sesi düzeyi"</item>
+    <item msgid="5762123934816216821">"alarm sesi düzeyi"</item>
+    <item msgid="785049718065337473">"bildirim sesi düzeyi"</item>
+    <item msgid="6700305533746877052">"Bluetooth sesi düzeyi"</item>
+    <item msgid="2029227495214047094">"uyanık tut"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Konum"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Sesi çal"</item>
     <item msgid="136815868796597058">"Panoyu oku"</item>
     <item msgid="5238692940326972503">"Panoyu değiştir"</item>
+    <item msgid="5753789168376302997">"Medya düğmeleri"</item>
+    <item msgid="3265262911688671938">"Ses odağı"</item>
+    <item msgid="2098976479485046797">"Ana ses düzeyi"</item>
+    <item msgid="5660213838861789350">"Konuşma sesi düzeyi"</item>
+    <item msgid="7983336752371254444">"Zil sesi düzeyi"</item>
+    <item msgid="7878027809189330917">"Medya sesi düzeyi"</item>
+    <item msgid="7260546305036218513">"Alarm sesi düzeyi"</item>
+    <item msgid="9103719301075748925">"Bildirim sesi düzeyi"</item>
+    <item msgid="7025966722295861512">"Bluetooth ses düzeyi"</item>
+    <item msgid="4665183401128289653">"Uyanık tut"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kısa"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Ekranda çizgi şeklinde"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfo içinde"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Kapalı"</item>
+    <item msgid="7688197031296835369">"Fazla çizilen alanları göster"</item>
+    <item msgid="8332661909019981149">"Fazla çizim sayacını göster"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standart sınır"</item>
     <item msgid="4071574792028999443">"Arka planda işlem yok"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 510a81d..11300b6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Kilit ekranında görüntülenecek metni yazın"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Kilit ekranında kullanıcı bilgilerini göster"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Kullanıcı bilgileri"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Kilit ekranında profil bilgisini göster"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profil bilgisi"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Konum erişimi"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Güvenlik"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ağı değiştir"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Kullanılabilir ağları görmek için Kablosuz\'u açın."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Kablosuz ağlar aranıyor…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Kablosuz ağı değiştirme izniniz yok."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Diğer ağ…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Diğer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Otomatik kurulum (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Değiştirmek için Ctrl-Ara Çubuğu\'na basın"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Varsayılan"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Klavye düzenleri"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kullanıcı sözlüğü"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kişisel sözlük"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Kişisel sözlükler"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Kişisel sözlük"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Ekle"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Sözlüğe ekle"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Perde"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Konuşulan metnin sesini etkiler"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Dil"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Dil seçilmedi"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Dil için tanımlı sesi, konuşulan metin için ayarlar"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Bir örnek dinleyin"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Konuşma sentezinin kısa bir sunumunu çal"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU ile çizim yapılırken pencerelerdeki görünümleri çiz"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Donanım katmanı güncellemelerini göster"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Flash donanım katmanları güncellendiğinde yeşildir"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"GPU fazla çizimini göster"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"En iyiden en kötüye: mavi, yeşil, açık kırmızı, kırmızı"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU fazla çizim hatasını ayıkla"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW katmanlarını devre dışı bırak"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Ekran oluştururken her zaman GPU\'yu kullan"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL izlerini etkinleştir"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Kullanıcılar ve Profiller"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Kullanıcı veya profil ekle"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Kısıtlı profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Kısıtlanmış bir profil oluşturabilmeniz için uygulamalarınızı ve kişisel verilerinizi korumak üzere bir ekran kilidi oluşturmanız gerekir."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Kilidi ayarla"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Yapılandırılmadı"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Yapılandırılmadı - Kısıtlı profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Sahibi"</string>
@@ -1833,7 +1834,8 @@
     <string name="user_nickname" msgid="5148818000228994488">"Takma Ad"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Ekle"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Kullanıcıların kendi uygulamaları ve içerikleri var"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Kısıtlı profiller yalnızca uygulamalara ve hesabınızdaki içeriklere erişebilir"</string>
+    <!-- no translation found for user_add_profile_item_summary (5931663986889138941) -->
+    <skip />
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Kullanıcı"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Kısıtlı profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Yeni kullanıcı ekle"</string>
@@ -1846,23 +1848,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Şimdi değil"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Yalnızca tabletin sahibi kullanıcıları yönetebilir."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Yalnızca telefonun sahibi kullanıcıları yönetebilir."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Kısıtlanmış profiller hesap ekleyemez"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Bu cihazdan sil: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Yeni kullanıcı"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Yeni profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Kendinizi silmek istiyor musunuz?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Kullanıcı kaldırılsın mı?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Profil kaldırılsın mı?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Bu tabletteki alanınızı ve verilerinizi kaybedeceksiniz. Bu işlemi geri alamazsınız."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Bu telefondaki alanınızı ve verilerinizi kaybedeceksiniz. Bu işlemi geri alamazsınız."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Kullanıcının alanı ve verileri bu tabletten silinecek. Bu işlemi geri alamazsınız."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Kullanıcının alanı ve verileri bu telefondan silinecek. Bu işlemi geri alamazsınız."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Bu profilin alanı ve verileri bu tabletten silinecek. Bu işlemi geri alamazsınız."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Bu profilin alanı ve verileri bu telefondan silinecek. Bu işlemi geri alamazsınız."</string>
     <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>
@@ -1879,12 +1877,12 @@
     <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>
+    <!-- no translation found for user_restrictions_title (7745810037152772035) -->
+    <skip />
     <string name="user_rename" msgid="8523499513614655279">"ADI DEĞİŞTİR"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Uygulama kısıtlamalarını ayarla"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> tarafından kontrol ediliyor"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Bu uygulama kısıtlanmış profillerde desteklenmez"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Bu uygulama hesaplarınıza erişebilir"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Kablosuz ve Mobil"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Kablosuz ve Mobil ayarlarını değiştirmeye izin ver"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 86ed51b..74d6f29 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Місцезнаходження"</item>
     <item msgid="255608127647030286">"Особисті дані"</item>
     <item msgid="4588829735729884491">"Повідомлення"</item>
-    <item msgid="8971765125227378270">"Пристрій"</item>
+    <item msgid="886742181977884584">"Медіа-файли"</item>
+    <item msgid="7924928667052300589">"Пристрій"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"приблизне місцезнаходження"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"відтворювати аудіо"</item>
     <item msgid="8374996688066472414">"читати буфер обміну"</item>
     <item msgid="3045529469061083747">"змінювати буфер обміну"</item>
+    <item msgid="5124443975763747838">"кнопки медіа"</item>
+    <item msgid="4547883971364273343">"активізація звуку"</item>
+    <item msgid="2603878814882344450">"загальна гучність"</item>
+    <item msgid="7136963238377062018">"гучність голосу"</item>
+    <item msgid="4270236897655923007">"гучність дзвінка"</item>
+    <item msgid="6325739889222559394">"гучність медіа"</item>
+    <item msgid="5762123934816216821">"гучність сигналу"</item>
+    <item msgid="785049718065337473">"гучність сповіщення"</item>
+    <item msgid="6700305533746877052">"гучність Bluetooth"</item>
+    <item msgid="2029227495214047094">"залишати активним"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Місцезнаходження"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Відтворювати аудіо"</item>
     <item msgid="136815868796597058">"Читати буфер обміну"</item>
     <item msgid="5238692940326972503">"Змінювати буфер обміну"</item>
+    <item msgid="5753789168376302997">"Кнопки медіа"</item>
+    <item msgid="3265262911688671938">"Активізація звуку"</item>
+    <item msgid="2098976479485046797">"Загальна гучність"</item>
+    <item msgid="5660213838861789350">"Гучність голосу"</item>
+    <item msgid="7983336752371254444">"Гучність дзвінка"</item>
+    <item msgid="7878027809189330917">"Гучність медіа"</item>
+    <item msgid="7260546305036218513">"Гучність сигналу"</item>
+    <item msgid="9103719301075748925">"Гучність сповіщення"</item>
+    <item msgid="7025966722295861512">"Гучність Bluetooth"</item>
+    <item msgid="4665183401128289653">"Залишати активним"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Коротка"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"На екрані у вигляді ліній"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Вимк."</item>
+    <item msgid="7688197031296835369">"Показувати області накладання"</item>
+    <item msgid="8332661909019981149">"Показувати лічильник накладання"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартне обмеження"</item>
     <item msgid="4071574792028999443">"Без фонових процесів"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0a01468..7c0e424 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -304,11 +304,13 @@
     <string name="lock_after_timeout" msgid="4590337686681194648">"Автоматичне блокування"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> після режиму сну"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Показувати інф-цію про власника на заблок. екрані"</string>
-    <string name="owner_info_settings_title" msgid="2723190010708381889">"Інф-ція про власника"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Інфо про власника"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Введіть текст, що відображ. на екрані блокування"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Показувати дані користувача на екрані блокування"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Дані користувача"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Показувати інформацію профілю на екрані блокування"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Інформація профілю"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Доступ до місцезнаходження"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Безпека"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Змінити мережу"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Щоб переглянути доступні мережі, увімкніть Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Пошук мереж Wi-Fi…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"У вас немає дозволу на змінення мережі Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Інша мережа…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Більше"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Авто-налаштування (WPS)"</string>
@@ -914,7 +915,7 @@
     <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>
+    <string name="master_clear_title" msgid="5907939616087039756">"Відновл. завод. налаштув."</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Видаляє всі дані в пристрої"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Видаляє всі дані в телефоні"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Це зітре всі дані з "<b>"внутрішньої пам’яті"</b>" вашого планшетного ПК, зокрема:"\n\n<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li>"."</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Щоб переключити, натис. Ctrl–Пробіл"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"За умовчанням"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Розкладки клавіатури"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Словник корист-ча"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Особистий словник"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Особисті словники"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Особистий словник"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Додати"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Додати до словника"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Вис. зв."</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Впливає на тон відтворюваного тексту"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Мова"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Мову не вибрано"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Устан. голос для відтворюваного тексту залежно від мови"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Прослухайте приклад"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Відтворити коротку демонстрацію синтезу мови"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Підсвічув. область у вікні під час рисування з GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Показ. апаратні оновлення"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Виділяти апаратні рівні зеленим під час оновлення"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Показати накладання GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Від кращого до гіршого: синій, зелений, світло-червоний, червоний"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Налагодити накладання GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Вимк. апаратн. накладання"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Завжди використовувати GPU для компонування екрана"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Увімк. трасування OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Користувачі та профілі"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Додати користувача чи профіль"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Профіль з обмеженням"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Перш ніж створювати обмежений профіль, потрібно налаштувати блокування екрана, щоб захистити свої програми та особисті дані."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Налаштувати блокування"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не створено"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Не налаштовано – профіль з обмеженням"</string>
     <string name="user_owner" msgid="3879126011135546571">"Власник"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Псевдонім"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Додавання"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Користувачі мають власні програми та вміст"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Профілі з обмеженням мають доступ до програм і вмісту лише з ваших облікових записів"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Ви можете обмежити доступ до програм і вмісту з вашого облікового запису"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Користувач"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Профіль з обмеженням"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Додати нового користувача"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не зараз"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Лише власник планшетного ПК може керувати користувачами."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Лише власник телефону може керувати користувачами."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Обмежені профілі не можуть додавати облікові записи"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> – видалити з пристрою"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Новий користувач"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Новий профіль"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Видалити себе?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Видалити користувача?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Вилучити профіль?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Вашу пам’ять і дані буде видалено з цього планшетного ПК. Цю дію не можна відмінити."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Вашу пам’ять і дані буде видалено з цього телефону. Цю дію не можна відмінити."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Пам’ять і дані цього користувача буде видалено з цього планшетного ПК. Цю дію не можна відмінити."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Пам’ять і дані цього користувача буде видалено з цього телефону. Цю дію не можна відмінити."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Пам’ять і дані цього профілю буде видалено з цього планшета. Цю дію не можна відмінити."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Пам’ять і дані цього профілю буде видалено з цього телефону. Цю дію не можна відмінити."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Обмеження для програм і вмісту"</string>
     <string name="user_rename" msgid="8523499513614655279">"ПЕРЕЙМЕНУВАТИ"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Установити обмеження для програми"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Керується програмою <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ця програма не підтримується в обмежених профілях"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ця програма може отримувати доступ до ваших облікових записів"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi і мобільні мережі"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Дозволити вносити зміни в налаштування Wi‑Fi і мобільних мереж"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 82ff460..3cf9df3 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Vị trí"</item>
     <item msgid="255608127647030286">"Cá nhân"</item>
     <item msgid="4588829735729884491">"Nhắn tin"</item>
-    <item msgid="8971765125227378270">"Thiết bị"</item>
+    <item msgid="886742181977884584">"Truyền thông"</item>
+    <item msgid="7924928667052300589">"Thiết bị"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"vị trí tổng thể"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"phát âm thanh"</item>
     <item msgid="8374996688066472414">"đọc khay nhớ tạm"</item>
     <item msgid="3045529469061083747">"sửa đổi khay nhớ tạm"</item>
+    <item msgid="5124443975763747838">"các nút phương tiện truyền thông"</item>
+    <item msgid="4547883971364273343">"tập trung âm thanh"</item>
+    <item msgid="2603878814882344450">"âm lượng chính"</item>
+    <item msgid="7136963238377062018">"âm lượng thoại"</item>
+    <item msgid="4270236897655923007">"âm lượng chuông"</item>
+    <item msgid="6325739889222559394">"âm lượng phương tiện truyền thông"</item>
+    <item msgid="5762123934816216821">"âm lượng báo thức"</item>
+    <item msgid="785049718065337473">"âm lượng thông báo"</item>
+    <item msgid="6700305533746877052">"âm lượng bluetooth"</item>
+    <item msgid="2029227495214047094">"không khóa màn hình"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Vị trí"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Phát âm thanh"</item>
     <item msgid="136815868796597058">"Đọc khay nhớ tạm"</item>
     <item msgid="5238692940326972503">"Sửa đổi khay nhớ tạm"</item>
+    <item msgid="5753789168376302997">"Các nút phương tiện"</item>
+    <item msgid="3265262911688671938">"Tập trung âm thanh"</item>
+    <item msgid="2098976479485046797">"Âm lượng chính"</item>
+    <item msgid="5660213838861789350">"Âm lượng thoại"</item>
+    <item msgid="7983336752371254444">"Âm lượng chuông"</item>
+    <item msgid="7878027809189330917">"Âm lượng phương tiện"</item>
+    <item msgid="7260546305036218513">"Âm lượng báo thức"</item>
+    <item msgid="9103719301075748925">"Âm lượng thông báo"</item>
+    <item msgid="7025966722295861512">"Âm lượng bluetooth"</item>
+    <item msgid="4665183401128289653">"Không khóa màn hình"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Ngắn"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Trên màn hình dưới dạng đường"</item>
     <item msgid="120512413928262547">"Trong adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Tắt"</item>
+    <item msgid="7688197031296835369">"Hiển thị các vùng vẽ quá"</item>
+    <item msgid="8332661909019981149">"Hiển thị bộ đo mức vẽ quá"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Giới hạn tiêu chuẩn"</item>
     <item msgid="4071574792028999443">"Không có quá trình nền"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 246d5e8..e80516e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Nhập văn bản để hiển thị trên màn hình khóa"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Hiển thị thông tin người dùng trên màn hình khóa"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Thông tin người dùng"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Hiển thị thông tin tiểu sử trên màn hình khóa"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Thông tin tiểu sử"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Quyền truy cập thông tin vị trí"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Bảo mật"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Đặt Vị trí của tôi, mở khóa màn hình, khóa thẻ SIM, khóa bộ nhớ thông tin xác thực"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Sửa đổi mạng"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Để xem các mạng khả dụng, hãy bật Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Đang tìm kiếm mạng Wi‑Fi..."</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Bạn không có quyền thay đổi mạng Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Mạng khác…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Thêm"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Thiết lập tự động (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Để chuyển, nhấn Control-Phím cách"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Mặc định"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Bố cục bàn phím"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Từ điển người dùng"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Từ điển cá nhân"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Từ điển cá nhân"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Từ điển cá nhân"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Thêm"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Thêm vào từ điển"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Độ cao"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ảnh hưởng đến âm của văn bản nói"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Ngôn ngữ"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Không thể chọn ngôn ngữ"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Đặt giọng nói ngôn ngữ cụ thể cho văn bản nói"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Nghe ví dụ"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Phát minh hoạ ngắn về tổng hợp tiếng nói"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Chuyển nhanh chế độ xem trong cửa sổ khi được vẽ bằng GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Hiện c.nhật lớp phần cứng"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Lớp phần cứng flash có màu xanh khi chúng cập nhật"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Hiển thị số tiền rút vượt quá bằng GPU"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Từ tốt nhất đến tồi nhất: lam, lục, đỏ tươi, đỏ"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Hiển thị mức vẽ quá GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Vô hiệu hóa các lớp phủ HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Luôn sử dụng GPU để tổng hợp màn hình"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Bật theo dõi OpenGL"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Người dùng và tiểu sử"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Thêm người dùng hoặc tiểu sử"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Tiểu sử bị hạn chế"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Trước khi bạn có thể tạo tiểu sử bị hạn chế, bạn sẽ cần thiết lập một màn hình khóa để bảo vệ các ứng dụng và dữ liệu cá nhân của bạn."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Thiết lập khóa"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Chưa thiết lập"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Chưa được thiết lập - Tiểu sử bị hạn chế"</string>
     <string name="user_owner" msgid="3879126011135546571">"Chủ sở hữu"</string>
@@ -1833,7 +1834,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Biệt hiệu"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Thêm"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Người dùng có ứng dụng và nội dung riêng của mình"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Tiểu sử bị hạn chế chỉ có thể truy cập vào ứng dụng và nội dung từ tài khoản của bạn"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Bạn có thể hạn chế quyền truy cập vào ứng dụng và nội dung từ tài khoản của bạn"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Người dùng"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Tiểu sử bị hạn chế"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Thêm người dùng mới"</string>
@@ -1846,23 +1847,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Không phải bây giờ"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Chỉ chủ sở hữu máy tính bảng mới có thể quản lý người dùng."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Chỉ chủ sở hữu điện thoại mới có thể quản lý người dùng."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Các tiểu sử bị hạn chế không thể thêm tài khoản"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Xóa <xliff:g id="USER_NAME">%1$s</xliff:g> khỏi thiết bị"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Người dùng mới"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Tiểu sử mới"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Xóa chính bạn?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Xóa người dùng?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Xóa tiểu sử?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Bạn sẽ mất không gian và dữ liệu của mình trên máy tính bảng này. Bạn không thể hoàn tác tác vụ này."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Bạn sẽ mất không gian và dữ liệu của mình trên điện thoại này. Bạn không thể hoàn tác tác vụ này."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Không gian và dữ liệu của người dùng này sẽ biến mất khỏi máy tính bảng này. Bạn không thể hoàn tác tác vụ này."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Không gian và dữ liệu của người dùng này sẽ biến mất khỏi điện thoại này. Bạn không thể hoàn tác tác vụ này."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Không gian và dữ liệu của tiểu sử này sẽ biến mất khỏi máy tính bảng này. Bạn không thể hoàn tác tác vụ này."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Không gian và dữ liệu của tiểu sử này sẽ biến mất khỏi điện thoại này. Bạn không thể hoàn tác tác vụ này."</string>
     <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>
@@ -1879,12 +1876,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Hạn chế nội dung và ứng dụng"</string>
     <string name="user_rename" msgid="8523499513614655279">"ĐỔI TÊN"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Đặt giới hạn ứng dụng"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Do <xliff:g id="APP">%1$s</xliff:g> kiểm soát"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ứng dụng này không được hỗ trợ trong các tiểu sử bị hạn chế"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ứng dụng này có thể truy cập tài khoản của bạn"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi và Di động"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Cho phép sửa đổi cài đặt Di động và Wi‑Fi"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 723b979..28c6385 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"位置"</item>
     <item msgid="255608127647030286">"个人"</item>
     <item msgid="4588829735729884491">"短信"</item>
-    <item msgid="8971765125227378270">"设备"</item>
+    <item msgid="886742181977884584">"媒体"</item>
+    <item msgid="7924928667052300589">"设备"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"粗略位置"</item>
@@ -261,12 +262,22 @@
     <item msgid="587124103118495063">"写入 ICC 短信"</item>
     <item msgid="2320577158869025503">"修改设置"</item>
     <item msgid="1545733463471924009">"在顶部绘制"</item>
-    <item msgid="3609046903962454582">"查看通知"</item>
+    <item msgid="3609046903962454582">"访问通知"</item>
     <item msgid="4671646036128214513">"相机"</item>
     <item msgid="1097324338692486211">"录制音频"</item>
     <item msgid="5031552983987798163">"播放音频"</item>
     <item msgid="8374996688066472414">"读取剪贴板内容"</item>
     <item msgid="3045529469061083747">"修改剪贴板内容"</item>
+    <item msgid="5124443975763747838">"媒体按钮"</item>
+    <item msgid="4547883971364273343">"音频焦点"</item>
+    <item msgid="2603878814882344450">"主音量"</item>
+    <item msgid="7136963238377062018">"语音音量"</item>
+    <item msgid="4270236897655923007">"铃声音量"</item>
+    <item msgid="6325739889222559394">"媒体音量"</item>
+    <item msgid="5762123934816216821">"闹钟音量"</item>
+    <item msgid="785049718065337473">"通知音量"</item>
+    <item msgid="6700305533746877052">"蓝牙音量"</item>
+    <item msgid="2029227495214047094">"保持唤醒状态"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置"</item>
@@ -294,12 +305,22 @@
     <item msgid="1188256962149204607">"发送短信/彩信"</item>
     <item msgid="4218544235221631789">"修改设置"</item>
     <item msgid="736541391767350377">"在顶部绘制"</item>
-    <item msgid="5530815681721654194">"查看通知"</item>
+    <item msgid="5530815681721654194">"访问通知"</item>
     <item msgid="781213371706962767">"相机"</item>
     <item msgid="1720492593061838172">"录制音频"</item>
     <item msgid="3493046322001257041">"播放音频"</item>
     <item msgid="136815868796597058">"读取剪贴板内容"</item>
     <item msgid="5238692940326972503">"修改剪贴板内容"</item>
+    <item msgid="5753789168376302997">"媒体按钮"</item>
+    <item msgid="3265262911688671938">"音频焦点"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"语音音量"</item>
+    <item msgid="7983336752371254444">"铃声音量"</item>
+    <item msgid="7878027809189330917">"媒体音量"</item>
+    <item msgid="7260546305036218513">"闹钟音量"</item>
+    <item msgid="9103719301075748925">"通知音量"</item>
+    <item msgid="7025966722295861512">"蓝牙音量"</item>
+    <item msgid="4665183401128289653">"保持唤醒状态"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"在屏幕上显示为线型图"</item>
     <item msgid="120512413928262547">"在 adb shell dumpsys gfxinfo 中"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"关闭"</item>
+    <item msgid="7688197031296835369">"显示过度绘制区域"</item>
+    <item msgid="8332661909019981149">"显示过度绘制计数器"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"标准限制"</item>
     <item msgid="4071574792028999443">"不允许后台进程"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 71c0194..d057eb0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"输入要在锁定屏幕上显示的文字"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"在锁定屏幕上显示用户信息"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"用户信息"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"在锁定屏幕上显示个人资料信息"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"个人资料信息"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"位置信息使用权"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"安全"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改网络"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"要查看可用网络,请打开 Wi-Fi。"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"正在搜索 Wi-Fi 网络…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"您无权更改 Wi‑Fi 网络。"</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"其他网络…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自动设置 (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"要切换,请按 Ctrl+空格键"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"默认"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"键盘布局"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"用户词典"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"个人词典"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"个人词典"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"个人词典"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"添加"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"添加到词典"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音高"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"更改所播放的文字的音调"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"语言"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"未选择语言"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"设置文字转语音功能要使用的语言"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"收听示例"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"播放简短的语音合成示例"</string>
@@ -1672,8 +1672,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"使用 GPU 进行绘图时闪烁显示窗口中的视图"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"显示硬件层更新"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Flash 硬件层在进行更新时会显示为绿色"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"显示 GPU 过度绘制"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"从最优到最差:蓝、绿、淡红、红"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"调试 GPU 过度绘制"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"停用 HW 叠加层"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"始终使用 GPU 进行屏幕合成"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"启用 OpenGL 跟踪"</string>
@@ -1826,6 +1825,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"用户和个人资料"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"添加用户或个人资料"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"受限个人资料"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"您需要先设置锁定屏幕来保护您的应用和个人数据,然后才可以创建受限个人资料。"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"设置锁定屏幕"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"未设置"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"未设置 - 受限个人资料"</string>
     <string name="user_owner" msgid="3879126011135546571">"机主"</string>
@@ -1833,7 +1834,8 @@
     <string name="user_nickname" msgid="5148818000228994488">"昵称"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"添加"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"用户拥有个人专属的应用和内容"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"受限个人资料只能通过您的帐户访问应用和内容"</string>
+    <!-- no translation found for user_add_profile_item_summary (5931663986889138941) -->
+    <skip />
     <string name="user_add_user_item_title" msgid="8212199632466198969">"用户"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"受限个人资料"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"添加新用户"</string>
@@ -1841,28 +1843,24 @@
     <string name="user_add_user_message_short" msgid="3310933423737035428">"您创建新用户后,该用户必须完成设置流程。"\n\n"任何用户均可代表其他所有用户接受应用的新权限。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"是否立即设置用户?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"请让这个人拿过平板电脑,让其设置自己的空间。"</string>
-    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"立即设置个人资料?"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"要立即设置个人资料吗?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"立即设置"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"以后再说"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"只有平板电脑的拥有者可以管理用户。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"只有手机的机主可以管理用户。"</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"受限个人资料无法添加帐户"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"将<xliff:g id="USER_NAME">%1$s</xliff:g>从此设备中删除"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新用户"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"新的个人资料"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"是否删除自己?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"是否删除用户?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"要删除个人资料吗?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"您将丢失自己在这台平板电脑上的空间和数据,此操作无法撤消。"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"您将丢失自己在这部手机上的空间和数据,此操作无法撤消。"</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"该用户在这台平板电脑上的空间和数据将会消失,此操作无法撤消。"</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"该用户在这部手机上的空间和数据将会消失,此操作无法撤消。"</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"此个人资料在这台平板电脑上的空间和数据将会消失,此操作无法撤消。"</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"此个人资料在这部手机上的空间和数据将会消失,此操作无法撤消。"</string>
     <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>
@@ -1878,14 +1876,14 @@
     <string name="user_account_title" msgid="1127193807312271167">"内容帐户"</string>
     <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="cell_broadcast_settings_summary" msgid="3301339398950905913">"选择要显示的紧急消息类型。"</string>
+    <!-- no translation found for user_restrictions_title (7745810037152772035) -->
+    <skip />
     <string name="user_rename" msgid="8523499513614655279">"重命名"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"设置应用限制"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"受“<xliff:g id="APP">%1$s</xliff:g>”控制"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
-    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"此应用可访问您的帐户"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"受限个人资料无法使用此应用"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"此应用可使用您的帐户"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi 和移动网络"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"允许修改 Wi‑Fi 和移动网络设置"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"蓝牙"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index a7f70da..7f47932 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"位置"</item>
     <item msgid="255608127647030286">"個人"</item>
     <item msgid="4588829735729884491">"簡訊"</item>
-    <item msgid="8971765125227378270">"裝置"</item>
+    <item msgid="886742181977884584">"媒體"</item>
+    <item msgid="7924928667052300589">"裝置"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"約略位置"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"播放音訊"</item>
     <item msgid="8374996688066472414">"讀取剪貼簿"</item>
     <item msgid="3045529469061083747">"修改剪貼簿"</item>
+    <item msgid="5124443975763747838">"媒體按鈕"</item>
+    <item msgid="4547883971364273343">"音訊焦點"</item>
+    <item msgid="2603878814882344450">"主音量"</item>
+    <item msgid="7136963238377062018">"語音音量"</item>
+    <item msgid="4270236897655923007">"鈴聲音量"</item>
+    <item msgid="6325739889222559394">"媒體音量"</item>
+    <item msgid="5762123934816216821">"鬧鐘音量"</item>
+    <item msgid="785049718065337473">"通知音量"</item>
+    <item msgid="6700305533746877052">"藍牙音量"</item>
+    <item msgid="2029227495214047094">"停用休眠"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"播放音訊"</item>
     <item msgid="136815868796597058">"讀取剪貼簿"</item>
     <item msgid="5238692940326972503">"修改剪貼簿"</item>
+    <item msgid="5753789168376302997">"媒體按鈕"</item>
+    <item msgid="3265262911688671938">"音訊焦點"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"語音音量"</item>
+    <item msgid="7983336752371254444">"鈴聲音量"</item>
+    <item msgid="7878027809189330917">"媒體音量"</item>
+    <item msgid="7260546305036218513">"鬧鐘音量"</item>
+    <item msgid="9103719301075748925">"通知音量"</item>
+    <item msgid="7025966722295861512">"藍牙音量"</item>
+    <item msgid="4665183401128289653">"停用休眠"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"在螢幕上以行顯示"</item>
     <item msgid="120512413928262547">"在「In adb shell dumpsys gfxinfo」指令中"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"關閉"</item>
+    <item msgid="7688197031296835369">"顯示透支區域"</item>
+    <item msgid="8332661909019981149">"顯示透支計數器"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準限制"</item>
     <item msgid="4071574792028999443">"不執行背景處理程序"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5ba4dfe..6d37d39 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"輸入要在鎖定畫面上顯示的文字"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"在鎖定畫面上顯示使用者資訊"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"使用者資訊"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"在鎖定畫面上顯示個人資料資訊"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"個人資料資訊"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"位置資訊存取"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"安全性"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
@@ -572,8 +574,7 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改網路"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"如要查看可用的網路,請開啟 Wi-Fi。"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"正在搜尋 Wi-Fi 網路…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"您沒有變更 Wi-Fi 網路的權限。"</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"其他網路…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定 (WPS)"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"如要切換,請按下 Ctrl+空白鍵。"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"預設"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"鍵盤配置"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"使用者字典"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"個人字典"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"個人字典"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"個人字典"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"新增"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"新增至字典"</string>
@@ -1396,7 +1395,7 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前端使用狀況"</string>
-    <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持清醒"</string>
+    <string name="usage_type_wake_lock" msgid="5125438890233677880">"停用休眠"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi 執行中"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"平板電腦"</string>
@@ -1456,6 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音調"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"影響文字轉語音功能的播放音調"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"語言"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"未選取語言"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"設定文字轉語音功能要用的語言"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"聆聽範例"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"播放簡短的語音合成範例"</string>
@@ -1676,8 +1676,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"使用 GPU 繪圖時在視窗中閃爍顯示畫面"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"顯示硬體層更新"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"在硬體層更新時閃綠燈"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"顯示 GPU 透支"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"從優到劣依序顯示:藍色、綠色、淺紅色、紅色"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"針對 GPU 透支情形進行偵錯"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"停用硬體重疊圖層"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"一律使用 GPU 進行畫面合成"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"啟用 OpenGL 追蹤"</string>
@@ -1827,46 +1826,44 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"許可"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"執行中"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"使用者"</string>
-    <string name="user_list_title" msgid="7937158411137563543">"使用者和設定檔"</string>
-    <string name="user_add_user_menu" msgid="3154537325132012954">"新增使用者或設定檔"</string>
-    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"受限的設定檔"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"使用者和個人資料"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"新增使用者或個人資料"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"設有限制的個人資料"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"如要建立設有限制的個人資料,您必須先設定螢幕鎖定來保護您的應用程式和個人資料。"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"設定鎖定"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"尚未設定"</string>
-    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"尚未建立 - 受限的設定檔"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"尚未建立 - 設有限制的個人資料"</string>
     <string name="user_owner" msgid="3879126011135546571">"擁有者"</string>
     <string name="user_you" msgid="1639158809315025986">"您 (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"暱稱"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"新增"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"使用者擁有個人專屬的應用程式和內容"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"受限的設定檔只能透過您的帳戶存取應用程式和內容"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"您可以限制他人透過您的帳戶存取應用程式和內容"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"使用者"</string>
-    <string name="user_add_profile_item_title" msgid="8353515490730363621">"受限的設定檔"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"設有限制的個人資料"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"新增使用者"</string>
     <string name="user_add_user_message_long" msgid="3086244205384741788">"您可以建立更多使用者,與更多人共用此裝置。每位使用者都擁有個人空間,可使用並自訂個人的應用程式和桌布等等。此外,使用者可以調整平板電腦設定 (例如會影響所有人的 Wi-Fi 設定)。"\n\n"建立新的使用者之後,必須請新使用者完成設定程序。"\n\n"任何使用者都可以代表其他所有使用者接受更新的應用程式權限。"</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"您建立新的使用者之後,對方必須完成設定程序。"\n\n"任何使用者都可以代表所有其他使用者接受更新的應用程式權限。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"立即設定使用者?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"請確保對方可以使用平板電腦並設定自己的空間"</string>
-    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"立即建立設定檔?"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"立即建立個人資料?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"立即設定"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"暫時不要"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"只有平板電腦的擁有者可以管理使用者。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"只有手機的擁有者可以管理使用者。"</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"設有限制的個人資料無法新增帳戶"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"將 <xliff:g id="USER_NAME">%1$s</xliff:g> 從這個裝置中刪除"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新使用者"</string>
-    <string name="user_new_profile_name" msgid="2632088404952119900">"新的設定檔"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"新的個人資料"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"您要刪除自己嗎?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"移除使用者?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"移除個人資料?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"您在這台平板電腦上的可用空間和資料將會消失,這個動作無法復原。"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"您在這支手機上的可用空間和資料將會消失,這個動作無法復原。"</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"這位使用者在這台平板電腦上的可用空間和資料將會消失,這個動作無法復原。"</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"這位使用者在這支手機上的可用空間和資料將會消失,這個動作無法復原。"</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"這個使用者個人資料在這台平板電腦上的可用空間和資料將會消失,而且這個動作無法復原。"</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"這個使用者個人資料在這支手機上的可用空間和資料將會消失,而且這個動作無法復原。"</string>
     <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>
@@ -1883,12 +1880,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"應用程式與內容限制"</string>
     <string name="user_rename" msgid="8523499513614655279">"重新命名"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"設定應用程式限制"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"受到「<xliff:g id="APP">%1$s</xliff:g>」控制"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"系統不支援設有限制的個人資料使用這個應用程式"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"這個應用程式可存取您的帳戶"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi 與行動網路"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"允許修改 Wi‑Fi 與行動網路設定"</string>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 00f602d..26722df 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Indawo"</item>
     <item msgid="255608127647030286">"Okomuntu siqu"</item>
     <item msgid="4588829735729884491">"Imilayezo"</item>
-    <item msgid="8971765125227378270">"Idivayisi"</item>
+    <item msgid="886742181977884584">"Abezindaba"</item>
+    <item msgid="7924928667052300589">"Idivayisi"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"indawo emaholoholo"</item>
@@ -267,6 +268,16 @@
     <item msgid="5031552983987798163">"dlala umsindo"</item>
     <item msgid="8374996688066472414">"funda ibhodi lokunamathisela"</item>
     <item msgid="3045529469061083747">"shintsha ibhodi lokunamathisela"</item>
+    <item msgid="5124443975763747838">"izinkinobho zabezindaba"</item>
+    <item msgid="4547883971364273343">"ukugxila komsindo"</item>
+    <item msgid="2603878814882344450">"ivolumu kangqo"</item>
+    <item msgid="7136963238377062018">"ivolumu yezwi"</item>
+    <item msgid="4270236897655923007">"ivolumu yokukhala"</item>
+    <item msgid="6325739889222559394">"ivolumu yabezindaba"</item>
+    <item msgid="5762123934816216821">"ivolumu ye-alamu"</item>
+    <item msgid="785049718065337473">"ivolumu yesaziso"</item>
+    <item msgid="6700305533746877052">"ivolumu ye-bluetooth"</item>
+    <item msgid="2029227495214047094">"gcina kuphapheme"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Indawo"</item>
@@ -300,6 +311,16 @@
     <item msgid="3493046322001257041">"Dlala umsindo"</item>
     <item msgid="136815868796597058">"Funda ibhodi lokunamathisela"</item>
     <item msgid="5238692940326972503">"Shintsha ibhodi lokunamathisela"</item>
+    <item msgid="5753789168376302997">"Izinkinobho zabezindaba"</item>
+    <item msgid="3265262911688671938">"Ukugxila komsindo"</item>
+    <item msgid="2098976479485046797">"Ivolumu kangqo"</item>
+    <item msgid="5660213838861789350">"Ivolumu yezwi"</item>
+    <item msgid="7983336752371254444">"Ivolumu yokukhala"</item>
+    <item msgid="7878027809189330917">"Ivolumu yabezindaba"</item>
+    <item msgid="7260546305036218513">"Ivolumu ye-alamu"</item>
+    <item msgid="9103719301075748925">"Ivolumu yesaziso"</item>
+    <item msgid="7025966722295861512">"Ivolumu ye-Bluetooth"</item>
+    <item msgid="4665183401128289653">"Gcina kuphapheme"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kufushane"</item>
@@ -367,6 +388,11 @@
     <item msgid="8272260411216018353">"Kusikrini njengemigqa"</item>
     <item msgid="120512413928262547">"Ku-adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Valiwe"</item>
+    <item msgid="7688197031296835369">"Bonisa izindawo zokukhipha okungaphezulu"</item>
+    <item msgid="8332661909019981149">"Bonisa ikhawunda yokukhipha okungaphezulu"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Isilanganiso esivamile"</item>
     <item msgid="4071574792028999443">"Azikho izinqubo zesizinda"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 7c6eb3d..93692aa 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -266,7 +266,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Izilungiselelo"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Isinqamuleli sezilungiselelo"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Imodi yendiza"</string>
-    <string name="radio_controls_title" msgid="6889937359495515769">"Okungaphezulu…"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Okuningi…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Amanethiwekhi; nokungenantambo"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Phatha i-Wi-Fi, i-Bluetooth, imodi yendiza, amanethiwekhi eselula; nama-VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Ukuzulazula kwedatha"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Faka umbhalo wokubonisa kwisikrini sokuvala"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Bonisa ulwazi lomsebenzisi esikrinini sokukhiya"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Ulwazi lomsebenzisi"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Bonisa ulwazi lwephrofayela ekukhiyeni isikrini"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Ulwazi lwephrofayela"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Ukufinyelela kwendawo"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Ukuphepha"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setha Indawo Yami, ukuvula isikrini, ukuvala ikhadi le-SIM, ukuvala isitoreji sokuqinisekisa"</string>
@@ -570,10 +572,9 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Xhuma kwinethiwekhi"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Khohlwa inethiwekhi"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Guqula inethiwekhi"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ukubona amanethiwekhi atholakalayo, vula i-WiFi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ukubona amanethiwekhi atholakalayo, vula i-Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Isesha amanethiwekhi e-Wi-Fi…"</string>
-    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
-    <skip />
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Awunayo imvume yokushintsha inethiwekhi ye-Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Enye inethiwekhi…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Okunye"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Ukusetha okuzenzakalelayo (WPS)"</string>
@@ -1241,9 +1242,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Ukuze ushintshe, cindezela u-Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Okuzenzakalelayo"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Izendlalelo zekhibhodi"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Sebenzisa isichazamazwi"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Isichazamazwi sakho"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Izichazamazwi eziqondene nawe"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Isichazamazwi somuntu siqu"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Engeza"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Faka kwisichazamazwi"</string>
@@ -1463,6 +1462,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ukuphakama"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ithinta ithoni yombhalo okhulunyiwe"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Ulimi"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Ulimi alukhethwanga"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ihlela izwi lolimi oluthize lombhalo okhulunyiwe"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Lalela isibonelo"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Dlala umboniso omfushane wamazwi"</string>
@@ -1679,8 +1679,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Ukubuka okukhanyayo phakathi kwamawindi uma kudwetshwe nge-GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Bonisa izibuyekezo zezendlalelo izingxenyekazi zekhompyutha"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Izendlalelo zengxenyekazi zekhompyutha eziluhlaza uma zibuyekeza"</string>
-    <string name="show_hw_overdraw" msgid="1136884304711318251">"Bonisa i-GPU overdraw"</string>
-    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Kusuka kokuhle kuya kokubi kakhulu: okuluhlaza okwesibhakabhaka, okuluhlaza okotshani, okubomvu okukhanyayo, okubomvu"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Susa iphutha lokukhipha okungaphezulu kwe-GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Khubaza izimbondela ze-HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Njalo sebenzisa i-GPU ukwakha isikrini"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Nika amandla ukulandelwa komkhondo kwe-OpenGL"</string>
@@ -1833,6 +1832,8 @@
     <string name="user_list_title" msgid="7937158411137563543">"Abasebenzisi namaphrofayela"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Engeza umsebenzisi noma iphrofayela"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Iphrofayela evinjelwe"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Ngaphambi kokuthi ungadala iphrofayela ekhawulelwe, kuzomele usethe ukukhiya isikrini ukuze uvikele izinhlelo zakho zokusebenza nedatha yakho yomuntu siqu."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Setha ukukhiya"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Akukho ukusetha"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Akusethiwe - Iphrofayela evinjelwe"</string>
     <string name="user_owner" msgid="3879126011135546571">"Umnikazi"</string>
@@ -1840,7 +1841,7 @@
     <string name="user_nickname" msgid="5148818000228994488">"Isidlaliso"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Engeza"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Abasebenzisi banezinhlelo zabo zokusebenza nokuqukethwe"</string>
-    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Amaphrofayela avinjelwe angafinyelela kuphela kuzinhlelo zokusebenza nokuqukethwe ukusuka kuma-akhawunti wakho"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Ungakhawulela ukufinyelela kuzinhlelo zokusebenza nokuqukethwe kusukela ku-akhawunti yakho"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Umsebenzisi"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Iphrofayela evinjelwe"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Engeza umsebenzisi omusha"</string>
@@ -1853,23 +1854,19 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Hhayi manje"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Umnikazi wethebhulethi kuphela ongaphatha abasebenzisi"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Umnikazi wefoni kuphela ongaphatha abasebenzisi."</string>
-    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
-    <skip />
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Amaphrofayela akhawulelwe awakwazi ukungeza ama-akhawunti"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Susa i-<xliff:g id="USER_NAME">%1$s</xliff:g> kule divayisi"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Umsebenzisi omusha"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Iphrofayela entsha"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Zisuse wena?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Susa umsebenzisi?"</string>
-    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
-    <skip />
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Susa iphrofayela?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Uzolahlekelwa yisikhala sakho nedatha kule thebhulethi. Awukwazi ukuhlehlisa lesi senzo."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Uzolahlekelwa yisikhala sakho nedatha kule foni. Awukwazi ukuhlehlisa lesi senzo."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Lesi sikhala somsebenzisi nedatha kuzonyamalala kule thebhulethi. Ungahlehlisa lesi senzo."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Lesi sikhala somsebenzisi nedatha kuzonyamalala kule foni. Ungahlehlisa lesi senzo."</string>
-    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
-    <skip />
-    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
-    <skip />
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Lesi sikhala sephrofayela nedatha kuzonyamalala kule thebhulethi. Ungahlehlisa lesi senzo."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Lesi sikhala ssephrofayela nedatha kuzonyamalala kule foni. Ungahlehlisa lesi senzo."</string>
     <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>
@@ -1886,12 +1883,11 @@
     <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_restrictions_title" msgid="7745810037152772035">"Imikhawulo yohlelo lokusebenza nokuqukethwe"</string>
     <string name="user_rename" msgid="8523499513614655279">"QAMBA KABUSHA"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Setha imikhawulo yohlelo lokusebenza"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Ilawulwa yi-<xliff:g id="APP">%1$s</xliff:g>"</string>
-    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
-    <skip />
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Lolu hlelo lokusebenza alusekelwe kumaphrofayela akhawulelwe"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Lolu hlelo lokusebenza lingafinyelela kuma-akhawunti wakho"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"I-Wi‑Fi neselula"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Vumela ukushintsha kwezilungiselelo ze-Wi-Fi nezeselula"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1a11ebb..93c1640 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -589,6 +589,7 @@
         <item>Location</item>
         <item>Personal</item>
         <item>Messaging</item>
+        <item>Media</item>
         <item>Device</item>
     </string-array>
 
@@ -625,6 +626,16 @@
         <item>play audio</item>
         <item>read clipboard</item>
         <item>modify clipboard</item>
+        <item>media buttons</item>
+        <item>audio focus</item>
+        <item>master volume</item>
+        <item>voice volume</item>
+        <item>ring volume</item>
+        <item>media volume</item>
+        <item>alarm volume</item>
+        <item>notification volume</item>
+        <item>bluetooth volume</item>
+        <item>keep awake</item>
     </string-array>
 
     <!-- User display names for app ops codes -->
@@ -660,6 +671,16 @@
         <item>Play audio</item>
         <item>Read clipboard</item>
         <item>Modify clipboard</item>
+        <item>Media buttons</item>
+        <item>Audio focus</item>
+        <item>Master volume</item>
+        <item>Voice volume</item>
+        <item>Ring volume</item>
+        <item>Media volume</item>
+        <item>Alarm volume</item>
+        <item>Notification volume</item>
+        <item>Bluetooth volume</item>
+        <item>Keep awake</item>
     </string-array>
 
     <!-- Titles for the list of long press timeout options. -->
@@ -830,6 +851,20 @@
         <item>true</item>
     </string-array>
 
+    <!-- Titles for debug overdraw preference. [CHAR LIMIT=35] -->
+    <string-array name="debug_hw_overdraw_entries">
+        <item>Off</item>
+        <item>Show overdraw areas</item>
+        <item>Show overdraw counter</item>
+    </string-array>
+
+    <!-- Values for debug overdraw preference. -->
+    <string-array name="debug_hw_overdraw_values" translatable="false" >
+        <item>false</item>
+        <item>show</item>
+        <item>count</item>
+    </string-array>
+
     <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
     <string-array name="app_process_limit_entries">
         <item>Standard limit</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3885f0b..4d09484 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1012,7 +1012,7 @@
     <!-- Summary for a warning message about security implications of enabling a notification
           listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
     <string name="notification_listener_security_warning_summary">
-        <xliff:g id="notification_listener_name">%1$s</xliff:g> will be able to 
+        <xliff:g id="notification_listener_name">%1$s</xliff:g> will be able to
         read all notifications posted by the system or any installed app, which may include personal
         information such as contact names and the text of messages sent to you. It will also be able
         to dismiss these notifications or touch action buttons within them.
@@ -2929,13 +2929,9 @@
     <string name="keyboard_layout_picker_title">Keyboard layouts</string>
 
     <!-- User dictionary settings --><skip />
-    <!-- User dictionary settings, The titlebar text of the User dictionary settings screen. -->
-    <string name="user_dict_settings_titlebar">User dictionary</string>
-    <!-- User dictionary settings, The title of the list item to go into the User dictionary settings screen when there is only one user dictionary. [CHAR LIMIT=35] -->
-    <string name="user_dict_single_settings_title">Personal dictionary</string>
-    <!-- User dictionary settings, The title of the list item to go into the User dictionary list when there are several user dictionaries. [CHAR LIMIT=35] -->
-    <string name="user_dict_multiple_settings_title">Personal dictionaries</string>
-    <!-- User dictionary settings.  The summary of the listem item to go into the User dictionary settings screen. -->
+    <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
+    <string name="user_dict_settings_title">Personal dictionary</string>
+    <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
     <string name="user_dict_settings_summary">""</string>
     <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
     <string name="user_dict_settings_add_menu_title">Add</string>
@@ -3441,8 +3437,11 @@
     <string name="tts_default_pitch_title">Pitch</string>
     <!-- On main TTS Settings screen, summary for default pitch for synthesized voice -->
     <string name="tts_default_pitch_summary">Affects the tone of the spoken text</string>
+
     <!-- On main TTS Settings screen, in default settings section, setting default language for synthesized voice -->
     <string name="tts_default_lang_title">Language</string>
+    <!-- On main TTS Settings screen, language summary if it can't default to system language [CHAR LIMIT=50] -->
+    <string name="tts_lang_not_selected">Language not selected</string>
     <!-- On main TTS Settings screen, summary for default language for synthesized voice -->
     <string name="tts_default_lang_summary">Sets the language-specific voice for the spoken text</string>
     <!-- On main TTS Settings screen, triggers playback of an example of speech synthesis -->
@@ -3978,9 +3977,7 @@
     <string name="show_hw_layers_updates_summary">Flash hardware layers green when they update</string>
 
     <!-- UI debug setting: show the amount of overdraw in apps using the GPU [CHAR LIMIT=25] -->
-    <string name="show_hw_overdraw">Show GPU overdraw</string>
-    <!-- UI debug setting: Show the amount of overdraw summary [CHAR LIMIT=50] -->
-    <string name="show_hw_overdraw_summary">From best to worst: blue, green, light red, red</string>
+    <string name="debug_hw_overdraw">Debug GPU overdraw</string>
 
     <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
     <string name="disable_overlays">Disable HW overlays</string>
@@ -4356,7 +4353,7 @@
     <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] -->
     <string name="user_add_user_item_summary">Users have their own apps and content</string>
     <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
-    <string name="user_add_profile_item_summary">Restricted profiles can only access the apps and content from your accounts</string>
+    <string name="user_add_profile_item_summary">You can restrict access to apps and content from your account</string>
     <!-- Button text for adding a regular user [CHAR LIMIT=25] -->
     <string name="user_add_user_item_title">User</string>
     <!-- Button text for adding a restricted profile [CHAR LIMIT=25] -->
@@ -4479,7 +4476,7 @@
     <string name="cell_broadcast_settings_summary">Select the types of emergency alerts to display.</string>
 
     <!-- User app limits screen title [CHAR LIMIT=35] -->
-    <string name="user_restrictions_title">Allow apps and content</string>
+    <string name="user_restrictions_title">Application and content restrictions</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] -->
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 3d1383a..8265779 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -166,10 +166,12 @@
                 android:title="@string/show_hw_layers_updates"
                 android:summary="@string/show_hw_layers_updates_summary"/>
 
-        <CheckBoxPreference
-                android:key="show_hw_overdraw"
-                android:title="@string/show_hw_overdraw"
-                android:summary="@string/show_hw_overdraw_summary"/>
+        <ListPreference
+                android:key="debug_hw_overdraw"
+                android:title="@string/debug_hw_overdraw"
+                android:persistent="false"
+                android:entries="@array/debug_hw_overdraw_entries"
+                android:entryValues="@array/debug_hw_overdraw_values" />
 
         <ListPreference
                 android:key="show_non_rect_clip"
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index f001486..3e7fdb5 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -29,7 +29,8 @@
 
     <!-- User dictionary preference title and fragment will be set programmatically. -->
     <PreferenceScreen
-            android:key="key_user_dictionary_settings" />
+            android:key="key_user_dictionary_settings"
+            android:title="@string/user_dict_settings_title" />
 
     <PreferenceCategory android:key="keyboard_settings_category"
             android:title="@string/keyboard_settings_category">
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 4ca98d8..f4188f1 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -355,6 +355,15 @@
         // Global gesture.
         mGlobalGesturePreferenceScreen =
                 (PreferenceScreen) findPreference(ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN);
+        final int longPressOnPowerBehavior = getActivity().getResources().getInteger(
+                com.android.internal.R.integer.config_longPressOnPowerBehavior);
+        final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1;
+        if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
+                || longPressOnPowerBehavior != LONG_PRESS_POWER_GLOBAL_ACTIONS) {
+            // Remove accessibility shortcut if power key is not present
+            // nor long press power does not show global actions menu.
+            mSystemsCategory.removePreference(mGlobalGesturePreferenceScreen);
+        }
     }
 
     private void updateAllPreferences() {
@@ -577,11 +586,16 @@
     }
 
     private void loadInstalledServices() {
+        Set<ComponentName> installedServices = sInstalledServices;
+        installedServices.clear();
+
         List<AccessibilityServiceInfo> installedServiceInfos =
                 AccessibilityManager.getInstance(getActivity())
                         .getInstalledAccessibilityServiceList();
-        Set<ComponentName> installedServices = sInstalledServices;
-        installedServices.clear();
+        if (installedServiceInfos == null) {
+            return;
+        }
+
         final int installedServiceInfoCount = installedServiceInfos.size();
         for (int i = 0; i < installedServiceInfoCount; i++) {
             ResolveInfo resolveInfo = installedServiceInfos.get(i).getResolveInfo();
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index aab4ba6..b16f3f6 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -395,6 +395,7 @@
                             LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
                     mLockPatternUtils.clearLock(isFallback);
                     mLockPatternUtils.saveLockPassword(pin, mRequestedQuality, isFallback);
+                    getActivity().setResult(RESULT_FINISHED);
                     getActivity().finish();
                 } else {
                     CharSequence tmp = mPasswordEntry.getText();
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 07b2e59..4355f20 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -48,7 +48,6 @@
 import android.os.StrictMode;
 import android.os.SystemProperties;
 import android.os.UserHandle;
-import android.os.UserManager;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -120,7 +119,7 @@
     private static final String SHOW_NON_RECTANGULAR_CLIP_KEY = "show_non_rect_clip";
     private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_udpates";
     private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_udpates";
-    private static final String SHOW_HW_OVERDRAW_KEY = "show_hw_overdraw";
+    private static final String DEBUG_HW_OVERDRAW_KEY = "debug_hw_overdraw";
     private static final String DEBUG_LAYOUT_KEY = "debug_layout";
     private static final String WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale";
     private static final String TRANSITION_ANIMATION_SCALE_KEY = "transition_animation_scale";
@@ -181,8 +180,8 @@
     private CheckBoxPreference mForceMsaa;
     private CheckBoxPreference mShowHwScreenUpdates;
     private CheckBoxPreference mShowHwLayersUpdates;
-    private CheckBoxPreference mShowHwOverdraw;
     private CheckBoxPreference mDebugLayout;
+    private ListPreference mDebugHwOverdraw;
     private ListPreference mTrackFrameTime;
     private ListPreference mShowNonRectClip;
     private ListPreference mWindowAnimationScale;
@@ -282,8 +281,8 @@
         mShowNonRectClip = addListPreference(SHOW_NON_RECTANGULAR_CLIP_KEY);
         mShowHwScreenUpdates = findAndInitCheckboxPref(SHOW_HW_SCREEN_UPDATES_KEY);
         mShowHwLayersUpdates = findAndInitCheckboxPref(SHOW_HW_LAYERS_UPDATES_KEY);
-        mShowHwOverdraw = findAndInitCheckboxPref(SHOW_HW_OVERDRAW_KEY);
         mDebugLayout = findAndInitCheckboxPref(DEBUG_LAYOUT_KEY);
+        mDebugHwOverdraw = addListPreference(DEBUG_HW_OVERDRAW_KEY);
         mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);
         mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);
         mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
@@ -479,7 +478,7 @@
         updateShowNonRectClipOptions();
         updateShowHwScreenUpdatesOptions();
         updateShowHwLayersUpdatesOptions();
-        updateShowHwOverdrawOptions();
+        updateDebugHwOverdrawOptions();
         updateDebugLayoutOptions();
         updateAnimationScaleOptions();
         updateOverlayDisplayDevicesOptions();
@@ -835,15 +834,29 @@
         pokeSystemProperties();
     }
 
-    private void updateShowHwOverdrawOptions() {
-        updateCheckBox(mShowHwOverdraw, SystemProperties.getBoolean(
-                HardwareRenderer.DEBUG_SHOW_OVERDRAW_PROPERTY, false));
+    private void updateDebugHwOverdrawOptions() {
+        String value = SystemProperties.get(HardwareRenderer.DEBUG_OVERDRAW_PROPERTY);
+        if (value == null) {
+            value = "";
+        }
+
+        CharSequence[] values = mDebugHwOverdraw.getEntryValues();
+        for (int i = 0; i < values.length; i++) {
+            if (value.contentEquals(values[i])) {
+                mDebugHwOverdraw.setValueIndex(i);
+                mDebugHwOverdraw.setSummary(mDebugHwOverdraw.getEntries()[i]);
+                return;
+            }
+        }
+        mDebugHwOverdraw.setValueIndex(0);
+        mDebugHwOverdraw.setSummary(mDebugHwOverdraw.getEntries()[0]);
     }
 
-    private void writeShowHwOverdrawOptions() {
-        SystemProperties.set(HardwareRenderer.DEBUG_SHOW_OVERDRAW_PROPERTY,
-                mShowHwOverdraw.isChecked() ? "true" : null);
+    private void writeDebugHwOverdrawOptions(Object newValue) {
+        SystemProperties.set(HardwareRenderer.DEBUG_OVERDRAW_PROPERTY,
+                newValue == null ? "" : newValue.toString());
         pokeSystemProperties();
+        updateDebugHwOverdrawOptions();
     }
 
     private void updateDebugLayoutOptions() {
@@ -1158,8 +1171,6 @@
             writeShowHwScreenUpdatesOptions();
         } else if (preference == mShowHwLayersUpdates) {
             writeShowHwLayersUpdatesOptions();
-        } else if (preference == mShowHwOverdraw) {
-            writeShowHwOverdrawOptions();
         } else if (preference == mDebugLayout) {
             writeDebugLayoutOptions();
         }
@@ -1192,6 +1203,9 @@
         } else if (preference == mTrackFrameTime) {
             writeTrackFrameTimeOptions(newValue);
             return true;
+        } else if (preference == mDebugHwOverdraw) {
+            writeDebugHwOverdrawOptions(newValue);
+            return true;
         } else if (preference == mShowNonRectClip) {
             writeShowNonRectClipOptions(newValue);
             return true;
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index b2145b0..27e7a54 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -50,6 +50,8 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 
 public class DeviceAdminAdd extends Activity {
     static final String TAG = "DeviceAdminAdd";
@@ -104,7 +106,7 @@
             finish();
             return;
         }
-        
+
         ActivityInfo ai;
         try {
             ai = getPackageManager().getReceiverInfo(cn, PackageManager.GET_META_DATA);
@@ -113,7 +115,37 @@
             finish();
             return;
         }
-        
+
+        // Make sure the given component name is actually a valid device admin.
+        List<ResolveInfo> avail = getPackageManager().queryBroadcastReceivers(
+                new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),
+                PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS);
+        int count = avail == null ? 0 : avail.size();
+        boolean found = false;
+        for (int i=0; i<count; i++) {
+            ResolveInfo ri = avail.get(i);
+            if (ai.packageName.equals(ri.activityInfo.packageName)
+                    && ai.name.equals(ri.activityInfo.name)) {
+                try {
+                    // We didn't retrieve the meta data for all possible matches, so
+                    // need to use the activity info of this specific one that was retrieved.
+                    ri.activityInfo = ai;
+                    DeviceAdminInfo dpi = new DeviceAdminInfo(this, ri);
+                    found = true;
+                } catch (XmlPullParserException e) {
+                    Log.w(TAG, "Bad " + ri.activityInfo, e);
+                } catch (IOException e) {
+                    Log.w(TAG, "Bad " + ri.activityInfo, e);
+                }
+                break;
+            }
+        }
+        if (!found) {
+            Log.w(TAG, "Request to add invalid device admin: " + cn);
+            finish();
+            return;
+        }
+
         ResolveInfo ri = new ResolveInfo();
         ri.activityInfo = ai;
         try {
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index 9cfb44d..fa1c7f4 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -43,8 +43,10 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class DeviceAdminSettings extends ListFragment {
     static final String TAG = "DeviceAdminSettings";
@@ -91,8 +93,33 @@
         List<ResolveInfo> avail = getActivity().getPackageManager().queryBroadcastReceivers(
                 new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),
                 PackageManager.GET_META_DATA | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS);
-        int count = avail == null ? 0 : avail.size();
-        for (int i=0; i<count; i++) {
+        if (avail == null) {
+            avail = Collections.emptyList();
+        }
+
+        // Some admins listed in mActiveAdmins may not have been found by the above query.
+        // We thus add them separately.
+        Set<ComponentName> activeAdminsNotInAvail = new HashSet<ComponentName>(mActiveAdmins);
+        for (ResolveInfo ri : avail) {
+            ComponentName riComponentName =
+                    new ComponentName(ri.activityInfo.packageName, ri.activityInfo.name);
+            activeAdminsNotInAvail.remove(riComponentName);
+        }
+        if (!activeAdminsNotInAvail.isEmpty()) {
+            avail = new ArrayList<ResolveInfo>(avail);
+            PackageManager packageManager = getActivity().getPackageManager();
+            for (ComponentName unlistedActiveAdmin : activeAdminsNotInAvail) {
+                List<ResolveInfo> resolved = packageManager.queryBroadcastReceivers(
+                        new Intent().setComponent(unlistedActiveAdmin),
+                        PackageManager.GET_META_DATA
+                                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS);
+                if (resolved != null) {
+                    avail.addAll(resolved);
+                }
+            }
+        }
+
+        for (int i = 0, count = avail.size(); i < count; i++) {
             ResolveInfo ri = avail.get(i);
             try {
                 DeviceAdminInfo dpi = new DeviceAdminInfo(getActivity(), ri);
diff --git a/src/com/android/settings/NotificationAccessSettings.java b/src/com/android/settings/NotificationAccessSettings.java
index c8cf7ac..07d4353 100644
--- a/src/com/android/settings/NotificationAccessSettings.java
+++ b/src/com/android/settings/NotificationAccessSettings.java
@@ -195,13 +195,26 @@
     }
 
     void updateList() {
-        mList.clear();
-
         loadEnabledListeners();
 
+        getListeners(mList, mPM);
+        mList.sort(new PackageItemInfo.DisplayNameComparator(mPM));
+
+        getListView().setAdapter(mList);
+    }
+
+    static int getListenersCount(PackageManager pm) {
+        return getListeners(null, pm);
+    }
+
+    private static int getListeners(ArrayAdapter<ServiceInfo> adapter, PackageManager pm) {
+        int listeners = 0;
+        if (adapter != null) {
+            adapter.clear();
+        }
         final int user = ActivityManager.getCurrentUser();
 
-        List<ResolveInfo> installedServices = mPM.queryIntentServicesAsUser(
+        List<ResolveInfo> installedServices = pm.queryIntentServicesAsUser(
                 new Intent(NotificationListenerService.SERVICE_INTERFACE),
                 PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,
                 user);
@@ -218,13 +231,12 @@
                         + android.Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE);
                 continue;
             }
-
-            mList.add(info);
+            if (adapter != null) {
+                adapter.add(info);
+            }
+            listeners++;
         }
-
-        mList.sort(new PackageItemInfo.DisplayNameComparator(mPM));
-
-        getListView().setAdapter(mList);
+        return listeners;
     }
 
     boolean isListenerEnabled(ServiceInfo info) {
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 56393e0..dd81ded 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -80,6 +80,13 @@
         R.id.alarm_mute_button
     };
 
+    private static final int[] SEEKBAR_SECTION_ID = new int[] {
+        R.id.media_section,
+        R.id.ringer_section,
+        R.id.notification_section,
+        R.id.alarm_section
+    };
+
     private static final int[] SEEKBAR_MUTED_RES_ID = new int[] {
         com.android.internal.R.drawable.ic_audio_vol_mute,
         com.android.internal.R.drawable.ic_audio_ring_notif_mute,
@@ -198,15 +205,33 @@
             getContext().registerReceiver(mRingModeChangedReceiver, filter);
         }
 
-        // Disable either ringer+notifications or notifications
-        int id;
-        if (!Utils.isVoiceCapable(getContext())) {
-            id = R.id.ringer_section;
+        boolean useMasterVolume = getContext().getResources().
+                getBoolean(com.android.internal.R.bool.config_useMasterVolume);
+        if (useMasterVolume) {
+            // If config_useMasterVolume is true, all streams are treated as STREAM_MASTER.
+            // So hide all except a stream.
+            int id;
+            if (Utils.isVoiceCapable(getContext())) {
+                id = R.id.ringer_section;
+            } else {
+                id = R.id.media_section;
+            }
+            for (int i = 0; i < SEEKBAR_SECTION_ID.length; i++) {
+                if (SEEKBAR_SECTION_ID[i] != id) {
+                    view.findViewById(SEEKBAR_SECTION_ID[i]).setVisibility(View.GONE);
+                }
+            }
         } else {
-            id = R.id.notification_section;
+            // Disable either ringer+notifications or notifications
+            int id;
+            if (!Utils.isVoiceCapable(getContext())) {
+                id = R.id.ringer_section;
+            } else {
+                id = R.id.notification_section;
+            }
+            View hideSection = view.findViewById(id);
+            hideSection.setVisibility(View.GONE);
         }
-        View hideSection = view.findViewById(id);
-        hideSection.setVisibility(View.GONE);
     }
 
     private Uri getMediaVolumeUri(Context context) {
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 535d881..948aded 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -82,6 +82,7 @@
     private static final String KEY_NOTIFICATION_ACCESS = "manage_notification_access";
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
 
+    private PackageManager mPM;
     DevicePolicyManager mDPM;
 
     private ChooseLockSettingsHelper mChooseLockSettingsHelper;
@@ -111,6 +112,7 @@
 
         mLockPatternUtils = new LockPatternUtils(getActivity());
 
+        mPM = getActivity().getPackageManager();
         mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);
 
         mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
@@ -281,15 +283,24 @@
             }
         }
 
-        final int n = getNumEnabledNotificationListeners();
         mNotificationAccess = findPreference(KEY_NOTIFICATION_ACCESS);
-        if (n == 0) {
-            mNotificationAccess.setSummary(getResources().getString(
-                    R.string.manage_notification_access_summary_zero));
-        } else {
-            mNotificationAccess.setSummary(String.format(getResources().getQuantityString(
-                    R.plurals.manage_notification_access_summary_nonzero,
-                    n, n)));
+        if (mNotificationAccess != null) {
+            final int total = NotificationAccessSettings.getListenersCount(mPM);
+            if (total == 0) {
+                if (deviceAdminCategory != null) {
+                    deviceAdminCategory.removePreference(mNotificationAccess);
+                }
+            } else {
+                final int n = getNumEnabledNotificationListeners();
+                if (n == 0) {
+                    mNotificationAccess.setSummary(getResources().getString(
+                            R.string.manage_notification_access_summary_zero));
+                } else {
+                    mNotificationAccess.setSummary(String.format(getResources().getQuantityString(
+                            R.plurals.manage_notification_access_summary_nonzero,
+                            n, n)));
+                }
+            }
         }
 
         return root;
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 687663a..cdfe7cd 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -45,7 +45,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore;
+
+import com.android.org.conscrypt.TrustedCertificateStore;
 
 public class TrustedCredentialsSettings extends Fragment {
 
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index b561ed4..b156105 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -16,30 +16,21 @@
 
 package com.android.settings;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
 import android.app.ListFragment;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.UserDictionary;
-import android.text.InputType;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.AlphabetIndexer;
-import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.SectionIndexer;
@@ -82,6 +73,7 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
     }
 
     @Override
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index 6cdbdaf..d20b6d9 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -149,29 +149,53 @@
                     true }
             );
 
-    public static final OpsTemplate DEVICE_TEMPLATE = new OpsTemplate(
+    public static final OpsTemplate MEDIA_TEMPLATE = new OpsTemplate(
             new int[] { AppOpsManager.OP_VIBRATE,
-                    AppOpsManager.OP_POST_NOTIFICATION,
+                    AppOpsManager.OP_CAMERA,
+                    AppOpsManager.OP_RECORD_AUDIO,
+                    AppOpsManager.OP_PLAY_AUDIO,
+                    AppOpsManager.OP_TAKE_MEDIA_BUTTONS,
+                    AppOpsManager.OP_TAKE_AUDIO_FOCUS,
+                    AppOpsManager.OP_AUDIO_MASTER_VOLUME,
+                    AppOpsManager.OP_AUDIO_VOICE_VOLUME,
+                    AppOpsManager.OP_AUDIO_RING_VOLUME,
+                    AppOpsManager.OP_AUDIO_MEDIA_VOLUME,
+                    AppOpsManager.OP_AUDIO_ALARM_VOLUME,
+                    AppOpsManager.OP_AUDIO_NOTIFICATION_VOLUME,
+                    AppOpsManager.OP_AUDIO_BLUETOOTH_VOLUME, },
+            new boolean[] { false,
+                    true,
+                    true,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false }
+            );
+
+    public static final OpsTemplate DEVICE_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_POST_NOTIFICATION,
                     AppOpsManager.OP_ACCESS_NOTIFICATIONS,
                     AppOpsManager.OP_CALL_PHONE,
                     AppOpsManager.OP_WRITE_SETTINGS,
                     AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
-                    AppOpsManager.OP_CAMERA,
-                    AppOpsManager.OP_RECORD_AUDIO,
-                    AppOpsManager.OP_PLAY_AUDIO },
+                    AppOpsManager.OP_WAKE_LOCK },
             new boolean[] { false,
-                    false,
                     true,
                     true,
                     true,
                     true,
-                    true,
-                    true,
-                    true }
+                    true,  }
             );
 
     public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] {
-            LOCATION_TEMPLATE, PERSONAL_TEMPLATE, MESSAGING_TEMPLATE, DEVICE_TEMPLATE
+            LOCATION_TEMPLATE, PERSONAL_TEMPLATE, MESSAGING_TEMPLATE,
+            MEDIA_TEMPLATE, DEVICE_TEMPLATE
     };
 
     /**
diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java
index b0d9ad1..4cee8e5 100644
--- a/src/com/android/settings/applications/AppOpsSummary.java
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -43,6 +43,7 @@
         AppOpsState.LOCATION_TEMPLATE,
         AppOpsState.PERSONAL_TEMPLATE,
         AppOpsState.MESSAGING_TEMPLATE,
+        AppOpsState.MEDIA_TEMPLATE,
         AppOpsState.DEVICE_TEMPLATE
     };
 
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index d373fdd..94ab11d 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -32,6 +32,7 @@
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Drawable.ConstantState;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
@@ -671,7 +672,12 @@
                 return super.loadIcon(context, state);
             }
             if (mUser.mIcon != null) {
-                return mUser.mIcon.getConstantState().newDrawable();
+                ConstantState constState = mUser.mIcon.getConstantState();
+                if (constState == null) {
+                    return mUser.mIcon;
+                } else {
+                    return constState.newDrawable();
+                }
             }
             return context.getResources().getDrawable(
                     com.android.internal.R.drawable.ic_menu_cc);
@@ -831,8 +837,8 @@
                 UserInfo info = mUm.getUserInfo(newItem.mUserId);
                 userItem.mUser.mInfo = info;
                 if (info != null) {
-                    userItem.mUser.mIcon = UserUtils.getUserIcon(mUm, info,
-                            context.getResources());
+                    userItem.mUser.mIcon = UserUtils.getUserIcon(context, mUm,
+                            info, context.getResources());
                 }
                 String name = info != null ? info.name : null;
                 if (name == null) {
diff --git a/src/com/android/settings/bluetooth/A2dpProfile.java b/src/com/android/settings/bluetooth/A2dpProfile.java
index fbf24c9..435a659 100755
--- a/src/com/android/settings/bluetooth/A2dpProfile.java
+++ b/src/com/android/settings/bluetooth/A2dpProfile.java
@@ -38,6 +38,9 @@
     private BluetoothA2dp mService;
     private boolean mIsProfileReady;
 
+    private final LocalBluetoothAdapter mLocalAdapter;
+    private final CachedBluetoothDeviceManager mDeviceManager;
+
     static final ParcelUuid[] SINK_UUIDS = {
         BluetoothUuid.AudioSink,
         BluetoothUuid.AdvAudioDist,
@@ -56,6 +59,19 @@
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
             if (V) Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothA2dp) proxy;
+            // We just bound to the service, so refresh the UI for any connected A2DP devices.
+            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+            while (!deviceList.isEmpty()) {
+                BluetoothDevice nextDevice = deviceList.remove(0);
+                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
+                // we may add a new device here, but generally this should not happen
+                if (device == null) {
+                    Log.w(TAG, "A2dpProfile found new device: " + nextDevice);
+                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
+                }
+                device.onProfileStateChanged(A2dpProfile.this, BluetoothProfile.STATE_CONNECTED);
+                device.refresh();
+            }
             mIsProfileReady=true;
         }
 
@@ -68,10 +84,14 @@
     public boolean isProfileReady() {
         return mIsProfileReady;
     }
-    A2dpProfile(Context context, LocalBluetoothProfileManager profileManager) {
+
+    A2dpProfile(Context context, LocalBluetoothAdapter adapter,
+            CachedBluetoothDeviceManager deviceManager,
+            LocalBluetoothProfileManager profileManager) {
+        mLocalAdapter = adapter;
+        mDeviceManager = deviceManager;
         mProfileManager = profileManager;
-        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-        adapter.getProfileProxy(context, new A2dpServiceListener(),
+        mLocalAdapter.getProfileProxy(context, new A2dpServiceListener(),
                 BluetoothProfile.A2DP);
     }
 
diff --git a/src/com/android/settings/bluetooth/HeadsetProfile.java b/src/com/android/settings/bluetooth/HeadsetProfile.java
index 83c8e8e..1caeb65 100755
--- a/src/com/android/settings/bluetooth/HeadsetProfile.java
+++ b/src/com/android/settings/bluetooth/HeadsetProfile.java
@@ -62,19 +62,19 @@
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
             if (V) Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothHeadset) proxy;
-            // We just bound to the service, so refresh the UI of the
-            // headset device.
+            // We just bound to the service, so refresh the UI for any connected HFP devices.
             List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-            if (!deviceList.isEmpty()) {
-                BluetoothDevice firstDevice = deviceList.get(0);
-                CachedBluetoothDevice device = mDeviceManager.findDevice(firstDevice);
+            while (!deviceList.isEmpty()) {
+                BluetoothDevice nextDevice = deviceList.remove(0);
+                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
                 // we may add a new device here, but generally this should not happen
                 if (device == null) {
-                    Log.w(TAG, "HeadsetProfile found new device: " + firstDevice);
-                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, firstDevice);
+                    Log.w(TAG, "HeadsetProfile found new device: " + nextDevice);
+                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
                 }
                 device.onProfileStateChanged(HeadsetProfile.this,
                         BluetoothProfile.STATE_CONNECTED);
+                device.refresh();
             }
 
             mProfileManager.callServiceConnectedListeners();
diff --git a/src/com/android/settings/bluetooth/HidProfile.java b/src/com/android/settings/bluetooth/HidProfile.java
index c502850..8df2845 100755
--- a/src/com/android/settings/bluetooth/HidProfile.java
+++ b/src/com/android/settings/bluetooth/HidProfile.java
@@ -38,6 +38,10 @@
     private BluetoothInputDevice mService;
     private boolean mIsProfileReady;
 
+    private final LocalBluetoothAdapter mLocalAdapter;
+    private final CachedBluetoothDeviceManager mDeviceManager;
+    private final LocalBluetoothProfileManager mProfileManager;
+
     static final String NAME = "HID";
 
     // Order of this profile in device profiles list
@@ -50,6 +54,19 @@
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
             if (V) Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothInputDevice) proxy;
+            // We just bound to the service, so refresh the UI for any connected HID devices.
+            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+            while (!deviceList.isEmpty()) {
+                BluetoothDevice nextDevice = deviceList.remove(0);
+                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
+                // we may add a new device here, but generally this should not happen
+                if (device == null) {
+                    Log.w(TAG, "HidProfile found new device: " + nextDevice);
+                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
+                }
+                device.onProfileStateChanged(HidProfile.this, BluetoothProfile.STATE_CONNECTED);
+                device.refresh();
+            }
             mIsProfileReady=true;
         }
 
@@ -63,7 +80,12 @@
         return mIsProfileReady;
     }
 
-    HidProfile(Context context, LocalBluetoothAdapter adapter) {
+    HidProfile(Context context, LocalBluetoothAdapter adapter,
+        CachedBluetoothDeviceManager deviceManager,
+        LocalBluetoothProfileManager profileManager) {
+        mLocalAdapter = adapter;
+        mDeviceManager = deviceManager;
+        mProfileManager = profileManager;
         adapter.getProfileProxy(context, new InputDeviceServiceListener(),
                 BluetoothProfile.INPUT_DEVICE);
     }
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
index 916ef9e..5d254ae 100755
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -111,7 +111,7 @@
         }
 
         // Always add HID and PAN profiles
-        mHidProfile = new HidProfile(context, mLocalAdapter);
+        mHidProfile = new HidProfile(context, mLocalAdapter, mDeviceManager, this);
         addProfile(mHidProfile, HidProfile.NAME,
                 BluetoothInputDevice.ACTION_CONNECTION_STATE_CHANGED);
 
@@ -138,7 +138,7 @@
         if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.AudioSource)) {
             if (mA2dpProfile == null) {
                 Log.d(TAG, "Adding local A2DP profile");
-                mA2dpProfile = new A2dpProfile(mContext, this);
+                mA2dpProfile = new A2dpProfile(mContext, mLocalAdapter, mDeviceManager, this);
                 addProfile(mA2dpProfile, A2dpProfile.NAME,
                         BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
             }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 2a3d5f8..39dc1d6 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -768,6 +768,8 @@
     }
 
     private void addUserUsage() {
+        final Context context = getActivity();
+        if (context == null) return;
         for (int i=0; i<mUserSippers.size(); i++) {
             final int userId = mUserSippers.keyAt(i);
             final List<BatterySipper> sippers = mUserSippers.valueAt(i);
@@ -775,16 +777,16 @@
             Drawable icon;
             String name;
             if (info != null) {
-                icon = UserUtils.getUserIcon(mUm, info, getResources());
+                icon = UserUtils.getUserIcon(context, mUm, info, getResources());
                 name = info != null ? info.name : null;
                 if (name == null) {
                     name = Integer.toString(info.id);
                 }
-                name = getActivity().getResources().getString(
+                name = context.getResources().getString(
                         R.string.running_process_item_user_label, name);
             } else {
                 icon = null;
-                name = getActivity().getResources().getString(
+                name = context.getResources().getString(
                         R.string.running_process_item_removed_user_label);
             }
             double power = mUserPower.get(userId);
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 2a5adb1..acb0c22 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -199,10 +199,6 @@
             // not present or disabled. In this case we need to remove the preference.
             getPreferenceScreen().removePreference(userDictionaryPreference);
         } else if (localeList.size() <= 1) {
-            final Intent intent =
-                    new Intent(UserDictionaryList.USER_DICTIONARY_SETTINGS_INTENT_ACTION);
-            userDictionaryPreference.setTitle(R.string.user_dict_single_settings_title);
-            userDictionaryPreference.setIntent(intent);
             userDictionaryPreference.setFragment(
                     com.android.settings.UserDictionarySettings.class.getName());
             // If the size of localeList is 0, we don't set the locale parameter in the
@@ -216,7 +212,6 @@
                 userDictionaryPreference.getExtras().putString("locale", locale);
             }
         } else {
-            userDictionaryPreference.setTitle(R.string.user_dict_multiple_settings_title);
             userDictionaryPreference.setFragment(UserDictionaryList.class.getName());
         }
     }
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
index 1bf68ce..2901673 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -28,8 +28,6 @@
 
 public class UserDictionaryAddWordActivity extends Activity {
 
-    private static final String STATE_KEY_IS_OPEN = "isOpen";
-
     public static final String MODE_EDIT_ACTION = "com.android.settings.USER_DICTIONARY_EDIT";
     public static final String MODE_INSERT_ACTION = "com.android.settings.USER_DICTIONARY_INSERT";
 
diff --git a/src/com/android/settings/net/UidDetailProvider.java b/src/com/android/settings/net/UidDetailProvider.java
index 63672b7..aca3e5d 100644
--- a/src/com/android/settings/net/UidDetailProvider.java
+++ b/src/com/android/settings/net/UidDetailProvider.java
@@ -121,7 +121,7 @@
             final UserInfo info = um.getUserInfo(userHandle);
             if (info != null) {
                 detail.label = res.getString(R.string.running_process_item_user_label, info.name);
-                detail.icon = UserUtils.getUserIcon(um, info, res);
+                detail.icon = UserUtils.getUserIcon(mContext, um, info, res);
                 return detail;
             }
         }
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index e02b6ae..bb5ac7a 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -22,6 +22,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
@@ -62,6 +63,9 @@
 
     private TextToSpeech mTts;
 
+    private int mSelectedLocaleIndex = -1;
+    private int mSystemLocaleIndex = -1;
+
     private final TextToSpeech.OnInitListener mTtsInitListener = new TextToSpeech.OnInitListener() {
         @Override
         public void onInit(int status) {
@@ -105,10 +109,6 @@
         mEngineSettingsPreference.setOnPreferenceClickListener(this);
         mInstallVoicesPreference = root.findPreference(KEY_INSTALL_DATA);
         mInstallVoicesPreference.setOnPreferenceClickListener(this);
-        // Remove this preference unless voices are indeed available to install.
-        root.removePreference(mInstallVoicesPreference);
-        // Remove this preference unless locales are indeed available.
-        root.removePreference(mLocalePreference);
 
         root.setTitle(getEngineLabel());
         root.setKey(getEngineName());
@@ -120,8 +120,8 @@
             mEngineSettingsPreference.setEnabled(false);
         }
         mInstallVoicesPreference.setEnabled(false);
-
         mLocalePreference.setEnabled(false);
+
         mLocalePreference.setEntries(new CharSequence[0]);
         mLocalePreference.setEntryValues(new CharSequence[0]);
 
@@ -130,7 +130,6 @@
         mTts = new TextToSpeech(getActivity().getApplicationContext(), mTtsInitListener,
                 getEngineName());
 
-
         // Check if data packs changed
         checkTtsData();
 
@@ -172,31 +171,26 @@
         final ArrayList<String> unavailable = mVoiceDataDetails.getStringArrayListExtra(
                 TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES);
 
+        if (unavailable != null && unavailable.size() > 0) {
+            mInstallVoicesPreference.setEnabled(true);
+        } else {
+            mInstallVoicesPreference.setEnabled(false);
+        }
+
         if (available == null){
             Log.e(TAG, "TTS data check failed (available == null).");
             mLocalePreference.setEnabled(false);
-            getPreferenceScreen().removePreference(mLocalePreference);
             return;
-        }
-
-        if (unavailable != null && unavailable.size() > 0) {
-            mInstallVoicesPreference.setEnabled(true);
-            getPreferenceScreen().addPreference(mInstallVoicesPreference);
         } else {
-            getPreferenceScreen().removePreference(mInstallVoicesPreference);
-        }
-
-        if (available.size() > 0) {
-            mLocalePreference.setEnabled(true);
-            getPreferenceScreen().addPreference(mLocalePreference);
             updateDefaultLocalePref(available);
-        } else {
-            mLocalePreference.setEnabled(false);
-            getPreferenceScreen().removePreference(mLocalePreference);
         }
     }
 
     private void updateDefaultLocalePref(ArrayList<String> availableLangs) {
+        if (availableLangs == null || availableLangs.size() == 0) {
+            mLocalePreference.setEnabled(false);
+            return;
+        }
         String currentLocale = mEnginesHelper.getLocalePrefForEngine(
                 getEngineName());
 
@@ -227,14 +221,20 @@
             }
         });
 
+        String defaultLocaleStr = mEnginesHelper.getDefaultLocale();
+
         // Get two arrays out of one of pairs
-        int selectedLanguageIndex = -1;
+        mSelectedLocaleIndex = -1;
+        mSystemLocaleIndex = -1;
         CharSequence[] entries = new CharSequence[availableLangs.size()];
         CharSequence[] entryValues = new CharSequence[availableLangs.size()];
         int i = 0;
         for (Pair<String, String> entry : entryPairs) {
             if (entry.second.equalsIgnoreCase(currentLocale)) {
-                selectedLanguageIndex = i;
+                mSelectedLocaleIndex = i;
+            }
+            if (entry.second.equalsIgnoreCase(defaultLocaleStr)) {
+                mSystemLocaleIndex = i;
             }
             entries[i] = entry.first;
             entryValues[i++] = entry.second;
@@ -242,11 +242,18 @@
 
         mLocalePreference.setEntries(entries);
         mLocalePreference.setEntryValues(entryValues);
-        if (selectedLanguageIndex > -1) {
-            mLocalePreference.setValueIndex(selectedLanguageIndex);
+        mLocalePreference.setEnabled(true);
+        setLocalePreference(mSelectedLocaleIndex);
+    }
+
+    /** Set entry from entry table in mLocalePreference */
+    private void setLocalePreference(int index) {
+        if (index < 0) {
+            mLocalePreference.setValue("");
+            mLocalePreference.setSummary(R.string.tts_lang_not_selected);
         } else {
-            mLocalePreference.setValueIndex(0);
-            updateLanguageTo(availableLangs.get(0));
+            mLocalePreference.setValueIndex(index);
+            mLocalePreference.setSummary(mLocalePreference.getEntries()[index]);
         }
     }
 
@@ -286,12 +293,32 @@
             updateLanguageTo((String) newValue);
             return true;
         }
-
         return false;
     }
 
     private void updateLanguageTo(String locale) {
-        mEnginesHelper.updateLocalePrefForEngine(getEngineName(), locale);
+        int selectedLocaleIndex = -1;
+        for (int i=0; i < mLocalePreference.getEntryValues().length; i++) {
+            if (locale.equalsIgnoreCase(mLocalePreference.getEntryValues()[i].toString())) {
+                selectedLocaleIndex = i;
+                break;
+            }
+        }
+
+        if (selectedLocaleIndex == -1) {
+            Log.w(TAG, "updateLanguageTo called with unknown locale argument");
+            return;
+        }
+        mLocalePreference.setSummary(mLocalePreference.getEntries()[selectedLocaleIndex]);
+        mSelectedLocaleIndex = selectedLocaleIndex;
+
+        if (mSelectedLocaleIndex == mSystemLocaleIndex) {
+            // Use empty locale, it will default to the system language
+            mEnginesHelper.updateLocalePrefForEngine(getEngineName(), "");
+        } else {
+            mEnginesHelper.updateLocalePrefForEngine(getEngineName(), locale);
+        }
+
         if (getEngineName().equals(mTts.getCurrentEngine())) {
             String[] localeArray = TtsEngines.parseLocalePref(locale);
             if (localeArray != null) {
@@ -307,5 +334,4 @@
     private String getEngineLabel() {
         return getArguments().getString(TtsEnginePreference.FRAGMENT_ARGS_LABEL);
     }
-
 }
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index f4e8d2c..3d68024 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -123,6 +123,8 @@
     /** Key for extra passed in from calling fragment to indicate if this is a newly created user */
     public static final String EXTRA_NEW_USER = "new_user";
 
+    private static final String KEY_SAVED_PHOTO = "pending_photo";
+
     HashMap<String,Boolean> mSelectedPackages = new HashMap<String,Boolean>();
     private boolean mFirstTime = true;
     private boolean mNewUser;
@@ -141,6 +143,7 @@
     private Dialog mEditUserInfoDialog;
 
     private EditUserPhotoController mEditUserPhotoController;
+    private Bitmap mSavedPhoto;
 
     private BroadcastReceiver mUserBackgrounding = new BroadcastReceiver() {
         @Override
@@ -273,6 +276,7 @@
 
         if (icicle != null) {
             mUser = new UserHandle(icicle.getInt(EXTRA_USER_ID));
+            mSavedPhoto = (Bitmap) icicle.getParcelable(KEY_SAVED_PHOTO);
         } else {
             Bundle args = getArguments();
 
@@ -307,6 +311,11 @@
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt(EXTRA_USER_ID, mUser.getIdentifier());
+        if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
+                && mEditUserPhotoController != null) {
+            outState.putParcelable(KEY_SAVED_PHOTO,
+                    mEditUserPhotoController.getNewUserPhotoBitmap());
+        }
     }
 
     public void onResume() {
@@ -317,11 +326,9 @@
         new AppLoadingTask().execute((Void[]) null);
 
         UserInfo info = mUserManager.getUserInfo(mUser.getIdentifier());
-        Bitmap userIcon = mUserManager.getUserIcon(mUser.getIdentifier());
-        CircleFramedDrawable circularIcon =
-                CircleFramedDrawable.getInstance(this.getActivity(), userIcon);
         ((TextView) mHeaderView.findViewById(android.R.id.title)).setText(info.name);
-        ((ImageView) mHeaderView.findViewById(android.R.id.icon)).setImageDrawable(circularIcon);
+        ((ImageView) mHeaderView.findViewById(android.R.id.icon)).setImageDrawable(
+                getCircularUserIcon());
     }
 
     public void onPause() {
@@ -337,6 +344,13 @@
         }
     }
 
+    private Drawable getCircularUserIcon() {
+        Bitmap userIcon = mUserManager.getUserIcon(mUser.getIdentifier());
+        CircleFramedDrawable circularIcon =
+                CircleFramedDrawable.getInstance(this.getActivity(), userIcon);
+        return circularIcon;
+    }
+
     private void updateUserAppList() {
         IPackageManager ipm = IPackageManager.Stub.asInterface(
                 ServiceManager.getService("package"));
@@ -567,7 +581,7 @@
                 final boolean isSettingsApp = packageName.equals(context.getPackageName());
                 AppRestrictionsPreference p = new AppRestrictionsPreference(context, this);
                 final boolean hasSettings = resolveInfoListHasPackage(receivers, packageName);
-                p.setIcon(app.icon);
+                p.setIcon(app.icon != null ? app.icon.mutate() : null);
                 p.setChecked(false);
                 p.setTitle(app.activityName);
                 if (app.masterEntry != null) {
@@ -593,6 +607,11 @@
                     p.setImmutable(true);
                     // If the app is required and has no restrictions, skip showing it
                     if (!hasSettings && !isSettingsApp) continue;
+                    // Get and populate the defaults, since the user is not going to be
+                    // able to toggle this app ON (it's ON by default and immutable).
+                    if (hasSettings) {
+                        requestRestrictionsForApp(packageName, p);
+                    }
                 } else if (!mNewUser && appInfoListHasPackage(mUserApps, packageName)) {
                     p.setChecked(true);
                 }
@@ -882,6 +901,12 @@
             }
         }
         preference.setRestrictions(restrictions);
+        if (count == 1 // No visible restrictions
+                && preference.isImmutable()
+                && preference.isChecked()) {
+            // Special case of required app with no visible restrictions. Remove it
+            mAppList.removePreference(preference);
+        }
     }
 
     /**
@@ -972,12 +997,22 @@
             userNameView.setText(info.name);
 
             final ImageView userPhotoView = (ImageView) content.findViewById(R.id.user_photo);
-            userPhotoView.setImageDrawable(mUserIconView.getDrawable());
+            Drawable drawable = null;
+            if (mSavedPhoto != null) {
+                drawable = CircleFramedDrawable.getInstance(getActivity(), mSavedPhoto);
+            } else {
+                drawable = mUserIconView.getDrawable();
+                if (drawable == null) {
+                    drawable = getCircularUserIcon();
+                }
+            }
+            userPhotoView.setImageDrawable(drawable);
 
-            mEditUserPhotoController = new EditUserPhotoController(this, userPhotoView);
+            mEditUserPhotoController = new EditUserPhotoController(this, userPhotoView,
+                    mSavedPhoto, drawable);
 
             mEditUserInfoDialog = new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.user_info_settings_title)
+                .setTitle(R.string.profile_info_settings_title)
                 .setIconAttribute(R.drawable.ic_settings_multiuser)
                 .setView(content)
                 .setCancelable(true)
@@ -998,10 +1033,11 @@
                                 }
                             }
                             // Update the photo if changed.
-                            Drawable userPhoto = mEditUserPhotoController.getNewUserPhotoDrawable();
-                            if (userPhoto != null
-                                    && !userPhoto.equals(mUserIconView.getDrawable())) {
-                                mUserIconView.setImageDrawable(userPhoto);
+                            Drawable drawable = mEditUserPhotoController.getNewUserPhotoDrawable();
+                            Bitmap bitmap = mEditUserPhotoController.getNewUserPhotoBitmap();
+                            if (drawable != null && bitmap != null
+                                    && !drawable.equals(mUserIconView.getDrawable())) {
+                                mUserIconView.setImageDrawable(drawable);
                                 new AsyncTask<Void, Void, Void>() {
                                     @Override
                                     protected Void doInBackground(Void... params) {
@@ -1013,9 +1049,15 @@
                             }
                             removeDialog(DIALOG_ID_EDIT_USER_INFO);
                         }
+                        clearEditUserInfoDialog();
                     }
                 })
-                .setNegativeButton(android.R.string.cancel, null)
+                .setNegativeButton(android.R.string.cancel,  new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        clearEditUserInfoDialog();
+                    }
+                 })
                 .create();
 
             // Make sure the IME is up.
@@ -1028,6 +1070,11 @@
         return null;
     }
 
+    private void clearEditUserInfoDialog() {
+        mEditUserInfoDialog = null;
+        mSavedPhoto = null;
+    }
+
     private static class EditUserPhotoController {
         private static final int POPUP_LIST_ITEM_ID_CHOOSE_PHOTO = 1;
         private static final int POPUP_LIST_ITEM_ID_TAKE_PHOTO = 2;
@@ -1053,7 +1100,8 @@
         private Bitmap mNewUserPhotoBitmap;
         private Drawable mNewUserPhotoDrawable;
 
-        public EditUserPhotoController(Fragment fragment, ImageView view) {
+        public EditUserPhotoController(Fragment fragment, ImageView view,
+                Bitmap bitmap, Drawable drawable) {
             mContext = view.getContext();
             mFragment = fragment;
             mImageView = view;
@@ -1066,6 +1114,8 @@
                     showUpdatePhotoPopup();
                 }
             });
+            mNewUserPhotoBitmap = bitmap;
+            mNewUserPhotoDrawable = drawable;
         }
 
         public boolean onActivityResult(int requestCode, int resultCode, final Intent data) {
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 04f7743..5145e10 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -18,9 +18,11 @@
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.app.Activity;
 import android.app.ActivityManagerNative;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -55,6 +57,9 @@
 import android.view.View.OnClickListener;
 import android.widget.SimpleAdapter;
 
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.ChooseLockGeneric;
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
 import com.android.settings.OwnerInfoSettings;
 import com.android.settings.R;
 import com.android.settings.SelectableEditTextPreference;
@@ -89,6 +94,7 @@
     private static final int DIALOG_SETUP_PROFILE = 4;
     private static final int DIALOG_USER_CANNOT_MANAGE = 5;
     private static final int DIALOG_CHOOSE_USER_TYPE = 6;
+    private static final int DIALOG_NEED_LOCKSCREEN = 7;
 
     private static final int MESSAGE_UPDATE_LIST = 1;
     private static final int MESSAGE_SETUP_USER = 2;
@@ -97,6 +103,8 @@
     private static final int USER_TYPE_USER = 1;
     private static final int USER_TYPE_RESTRICTED_PROFILE = 2;
 
+    private static final int REQUEST_CHOOSE_LOCK = 10;
+
     private static final String KEY_ADD_USER_LONG_MESSAGE_DISPLAYED =
             "key_add_user_long_message_displayed";
 
@@ -126,6 +134,7 @@
     private final Object mUserLock = new Object();
     private UserManager mUserManager;
     private SparseArray<Bitmap> mUserIcons = new SparseArray<Bitmap>();
+    private Drawable mDefaultCircleAvatar;
     private boolean mIsOwner = UserHandle.myUserId() == UserHandle.USER_OWNER;
 
 
@@ -192,15 +201,10 @@
         loadProfile();
         setHasOptionsMenu(true);
         IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
+        filter.addAction(Intent.ACTION_USER_ADDED);
         filter.addAction(Intent.ACTION_USER_INFO_CHANGED);
         getActivity().registerReceiverAsUser(mUserChangeReceiver, UserHandle.ALL, filter, null,
                 mHandler);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        loadProfile();
         updateUserList();
     }
 
@@ -275,6 +279,38 @@
         }
     }
 
+    private Drawable getDefaultCircleAvatar() {
+        if (mDefaultCircleAvatar == null) {
+            mDefaultCircleAvatar = encircle(R.drawable.avatar_default_1);
+        }
+        return mDefaultCircleAvatar;
+    }
+
+    private boolean hasLockscreenSecurity() {
+        LockPatternUtils lpu = new LockPatternUtils(getActivity());
+        return lpu.isLockPasswordEnabled() || lpu.isLockPatternEnabled();
+    }
+
+    private void launchChooseLockscreen() {
+        Intent chooseLockIntent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
+        chooseLockIntent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+        startActivityForResult(chooseLockIntent, REQUEST_CHOOSE_LOCK);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == REQUEST_CHOOSE_LOCK) {
+            if (resultCode != Activity.RESULT_CANCELED && hasLockscreenSecurity()) {
+                addUserNow(USER_TYPE_RESTRICTED_PROFILE);
+            } else {
+                showDialog(DIALOG_NEED_LOCKSCREEN);
+            }
+        }
+    }
+
     private void onAddUserClicked(int userType) {
         synchronized (mUserLock) {
             if (mRemovingUserId == -1 && !mAddingUser) {
@@ -283,7 +319,11 @@
                     showDialog(DIALOG_ADD_USER);
                     break;
                 case USER_TYPE_RESTRICTED_PROFILE:
-                    addUserNow(USER_TYPE_RESTRICTED_PROFILE);
+                    if (hasLockscreenSecurity()) {
+                        addUserNow(USER_TYPE_RESTRICTED_PROFILE);
+                    } else {
+                        showDialog(DIALOG_NEED_LOCKSCREEN);
+                    }
                     break;
                 }
             }
@@ -339,13 +379,9 @@
             Bundle extras = new Bundle();
             extras.putInt(AppRestrictionsFragment.EXTRA_USER_ID, userId);
             extras.putBoolean(AppRestrictionsFragment.EXTRA_NEW_USER, newUser);
-            String title = getResources().getString(R.string.user_new_user_name);
-            if (userId > UserHandle.USER_OWNER) {
-                title = mUserManager.getUserInfo(userId).name;
-            }
             ((PreferenceActivity) getActivity()).startPreferencePanel(
                     AppRestrictionsFragment.class.getName(),
-                    extras, 0, title,
+                    extras, R.string.user_restrictions_title, null,
                     null, 0);
         } else if (info.id == UserHandle.myUserId()) {
             // Jump to owner info panel
@@ -489,6 +525,20 @@
                         .create();
                 return dlg;
             }
+            case DIALOG_NEED_LOCKSCREEN: {
+                Dialog dlg = new AlertDialog.Builder(context)
+                        .setMessage(R.string.user_need_lock_message)
+                        .setPositiveButton(R.string.user_set_lock_button,
+                                new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        launchChooseLockscreen();
+                                    }
+                                })
+                        .setNegativeButton(android.R.string.cancel, null)
+                        .create();
+                return dlg;
+            }
             default:
                 return null;
         }
@@ -591,7 +641,7 @@
             if (user.iconPath != null) {
                 if (mUserIcons.get(user.id) == null) {
                     missingIcons.add(user.id);
-                    pref.setIcon(encircle(R.drawable.avatar_default_1));
+                    pref.setIcon(getDefaultCircleAvatar());
                 } else {
                     setPhotoId(pref, user);
                 }
@@ -603,7 +653,7 @@
                     null, null);
             pref.setEnabled(false);
             pref.setTitle(R.string.user_new_user_name);
-            pref.setIcon(encircle(R.drawable.avatar_default_1));
+            pref.setIcon(getDefaultCircleAvatar());
             mUserListCategory.addPreference(pref);
         }
         getActivity().invalidateOptionsMenu();
diff --git a/src/com/android/settings/users/UserUtils.java b/src/com/android/settings/users/UserUtils.java
index 1d16bcf..946d871 100644
--- a/src/com/android/settings/users/UserUtils.java
+++ b/src/com/android/settings/users/UserUtils.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.users;
 
+import android.content.Context;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -24,10 +25,10 @@
 import android.os.UserManager;
 
 public class UserUtils {
-    public static Drawable getUserIcon(UserManager um, UserInfo user, Resources res) {
+    public static Drawable getUserIcon(Context context, UserManager um, UserInfo user, Resources res) {
         if (user.iconPath == null) return null;
         Bitmap icon = um.getUserIcon(user.id);
         if (icon == null) return null;
-        return new BitmapDrawable(res, icon);
+        return CircleFramedDrawable.getInstance(context, icon);
     }
 }
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index 641a7ab..87d1caf 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -20,10 +20,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.database.ContentObserver;
 import android.net.NetworkInfo;
 import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.widget.CompoundButton;
 import android.widget.Switch;
@@ -117,11 +119,10 @@
             mWifiManager.setWifiApEnabled(null, false);
         }
 
-        if (mWifiManager.setWifiEnabled(isChecked)) {
-            // Intent has been taken into account, disable until new state is active
-            mSwitch.setEnabled(false);
-        } else {
+        mSwitch.setEnabled(false);
+        if (!mWifiManager.setWifiEnabled(isChecked)) {
             // Error
+            mSwitch.setEnabled(true);
             Toast.makeText(mContext, R.string.wifi_error, Toast.LENGTH_SHORT).show();
         }
     }
diff --git a/src/com/android/settings/wifi/WifiNotifyScanModeActivity.java b/src/com/android/settings/wifi/WifiNotifyScanModeActivity.java
deleted file mode 100644
index 3356b06..0000000
--- a/src/com/android/settings/wifi/WifiNotifyScanModeActivity.java
+++ /dev/null
@@ -1,133 +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.wifi;
-
-import com.android.settings.R;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.location.LocationManager;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-
-/**
- * This activity notifies the user that wifi scans are still available when Wi-Fi is being
- * turned off
- */
-public class WifiNotifyScanModeActivity extends Activity {
-    private DialogFragment mDialog;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Intent intent = getIntent();
-        if (intent != null && intent.getAction()
-                .equals(WifiManager.ACTION_NOTIFY_SCAN_ALWAYS_AVAILABLE)) {
-            createDialog();
-        } else {
-            finish();
-            return;
-        }
-    }
-
-    private void createDialog() {
-        if (mDialog == null) {
-            mDialog = AlertDialogFragment.newInstance();
-            mDialog.show(getFragmentManager(), "dialog");
-        }
-    }
-
-    private void dismissDialog() {
-        if (mDialog != null) {
-            mDialog.dismiss();
-            mDialog = null;
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        dismissDialog();
-    }
-
-    public void onResume() {
-        super.onResume();
-        createDialog();
-    }
-
-    void doPositiveButton(boolean checked) {
-        Settings.Global.putInt(getContentResolver(),
-                Settings.Global.WIFI_NOTIFY_SCAN_ALWAYS_AVAILABLE, checked ? 0 : 1);
-        finish();
-    }
-
-    public static class AlertDialogFragment extends DialogFragment {
-        static AlertDialogFragment newInstance() {
-            AlertDialogFragment frag = new AlertDialogFragment();
-            return frag;
-        }
-
-        public AlertDialogFragment() {
-            super();
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            View checkBoxView = View.inflate(getActivity(), R.layout.wifi_notify_scan_mode, null);
-            final CheckBox checkBox = (CheckBox) checkBoxView.findViewById(R.id.checkbox);
-            final String msg;
-            if (Settings.Secure.isLocationProviderEnabled(getActivity().getContentResolver(),
-                    LocationManager.NETWORK_PROVIDER)) {
-                msg = getString(R.string.wifi_scan_notify_text_location_on);
-            } else {
-                msg = getString(R.string.wifi_scan_notify_text_location_off);
-            }
-            return new AlertDialog.Builder(getActivity())
-                    .setMessage(msg)
-                    .setView(checkBoxView)
-                    .setPositiveButton(R.string.dlg_ok,
-                            new DialogInterface.OnClickListener() {
-                                public void onClick(DialogInterface dialog, int whichButton) {
-                                    ((WifiNotifyScanModeActivity) getActivity()).doPositiveButton(
-                                            checkBox.isChecked());
-                                }
-                            }
-                    )
-                    .setNegativeButton(R.string.dlg_cancel,
-                            new DialogInterface.OnClickListener() {
-                                public void onClick(DialogInterface dialog, int whichButton) {
-                                    ((WifiNotifyScanModeActivity) getActivity()).finish();
-                                }
-                            }
-                    )
-                    .create();
-        }
-        @Override
-        public void onCancel(DialogInterface dialog) {
-            ((WifiNotifyScanModeActivity) getActivity()).finish();
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 8ff54a8..82d15e5 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -30,6 +30,7 @@
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
@@ -46,6 +47,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
+import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -255,9 +257,19 @@
                 customButton.setOnClickListener(new OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        if (isPhone() && !hasSimProblem()) {
+                        boolean isConnected = false;
+                        Activity activity = getActivity();
+                        final ConnectivityManager connectivity = (ConnectivityManager)
+                                activity.getSystemService(Context.CONNECTIVITY_SERVICE);
+                        if (connectivity != null) {
+                            final NetworkInfo info = connectivity.getActiveNetworkInfo();
+                            isConnected = (info != null) && info.isConnected();
+                        }
+                        if (isConnected) {
+                            // Warn of possible data charges
                             showDialog(WIFI_SKIPPED_DIALOG_ID);
                         } else {
+                            // Warn of lack of updates
                             showDialog(WIFI_AND_MOBILE_SKIPPED_DIALOG_ID);
                         }
                     }
@@ -687,26 +699,6 @@
         return super.onCreateDialog(dialogId);
     }
 
-    private boolean isPhone() {
-        final TelephonyManager telephonyManager = (TelephonyManager)this.getSystemService(
-                Context.TELEPHONY_SERVICE);
-        return telephonyManager != null
-                && telephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_NONE;
-    }
-
-    /**
-    * Return true if there's any SIM related impediment to connectivity.
-    * Treats Unknown as OK. (Only returns true if we're sure of a SIM problem.)
-    */
-   protected boolean hasSimProblem() {
-       final TelephonyManager telephonyManager = (TelephonyManager)this.getSystemService(
-               Context.TELEPHONY_SERVICE);
-       return telephonyManager != null
-               && telephonyManager.getCurrentPhoneType() == TelephonyManager.PHONE_TYPE_GSM
-               && telephonyManager.getSimState() != TelephonyManager.SIM_STATE_READY
-               && telephonyManager.getSimState() != TelephonyManager.SIM_STATE_UNKNOWN;
-   }
-
     /**
      * Shows the latest access points available with supplimental information like
      * the strength of network and the security for it.
@@ -743,11 +735,28 @@
                 break;
 
             case WifiManager.WIFI_STATE_DISABLED:
-                addMessagePreference(R.string.wifi_empty_list_wifi_off);
+                setOffMessage();
                 break;
         }
     }
 
+    private void setOffMessage() {
+        if (mEmptyView != null) {
+            mEmptyView.setText(R.string.wifi_empty_list_wifi_off);
+            mEmptyView.append("\n\n");
+            int resId;
+            if (Settings.Secure.isLocationProviderEnabled(getActivity().getContentResolver(),
+                    LocationManager.NETWORK_PROVIDER)) {
+                resId = R.string.wifi_scan_notify_text_location_on;
+            } else {
+                resId = R.string.wifi_scan_notify_text_location_off;
+            }
+            CharSequence charSeq = getText(resId);
+            mEmptyView.append(charSeq);
+        }
+        getPreferenceScreen().removeAll();
+    }
+
     private void addMessagePreference(int messageId) {
         if (mEmptyView != null) mEmptyView.setText(messageId);
         getPreferenceScreen().removeAll();
@@ -906,7 +915,7 @@
                 break;
 
             case WifiManager.WIFI_STATE_DISABLED:
-                addMessagePreference(R.string.wifi_empty_list_wifi_off);
+                setOffMessage();
                 break;
         }
 
diff --git a/tests/res/values-ca/strings.xml b/tests/res/values-ca/strings.xml
index d988ebb..8ddac7d 100644
--- a/tests/res/values-ca/strings.xml
+++ b/tests/res/values-ca/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="3169265480789026010">"Detectable"</string>
+    <string name="discoverable" msgid="3169265480789026010">"Visible"</string>
     <string name="start_scan" msgid="6035699220942169744">"Inicia la cerca"</string>
     <string name="stop_scan" msgid="527546916633745779">"Atura la cerca"</string>
     <string name="operator_hello" msgid="292208161864910159">"Hola, Operador!"</string>