diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 58e7f70..0fb6228 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -86,18 +86,30 @@
                 android:label="@string/settings_label_launcher"
                 android:launchMode="singleTask">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
+        <!-- Alias for launcher activity only, as this belongs to each profile. -->
+        <activity-alias android:name="Settings"
+                android:taskAffinity="com.android.settings"
+                android:label="@string/settings_label_launcher"
+                android:launchMode="singleTask"
+                android:targetActivity="Settings">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
+
         <receiver android:name="ManagedProfileSetup">
             <intent-filter>
                 <action android:name="android.intent.action.USER_INITIALIZE"/>
+                <action android:name="android.intent.action.PRE_BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
 
@@ -137,18 +149,6 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="AirplaneModeVoiceActivity"
-                android:label="@string/wireless_networks_settings_title"
-                android:theme="@android:style/Theme.Material.Light.Voice"
-                android:exported="true"
-                android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.settings.VOICE_CONTROL_AIRPLANE_MODE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE" />
-            </intent-filter>
-        </activity>
-
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"
@@ -406,6 +406,8 @@
                 android:value="com.android.settings.vpn2.VpnSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/wireless_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
         </activity>
 
         <activity android:name="Settings$DateTimeSettingsActivity"
@@ -1668,7 +1670,7 @@
                   android:launchMode="singleTop"
                   android:excludeFromRecents="true"
                   android:theme="@style/Theme.CryptKeeper"
-                  android:configChanges="keyboard|keyboardHidden|uiMode"
+                  android:configChanges="mnc|mcc|keyboard|keyboardHidden|uiMode"
                   android:windowSoftInputMode="adjustResize"
                   android:screenOrientation="nosensor">
             <intent-filter android:priority="10">
diff --git a/res/drawable-hdpi/ic_person_white.png b/res/drawable-hdpi/ic_person_white.png
deleted file mode 100644
index 009524a..0000000
--- a/res/drawable-hdpi/ic_person_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/nfc_payment_empty_state.png b/res/drawable-hdpi/nfc_payment_empty_state.png
index 300a053..7d20bc8 100644
--- a/res/drawable-hdpi/nfc_payment_empty_state.png
+++ b/res/drawable-hdpi/nfc_payment_empty_state.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_person_white.png b/res/drawable-mdpi/ic_person_white.png
deleted file mode 100644
index 563f1d1..0000000
--- a/res/drawable-mdpi/ic_person_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/nfc_payment_empty_state.png b/res/drawable-mdpi/nfc_payment_empty_state.png
index 28a1e31..67ea0b7 100644
--- a/res/drawable-mdpi/nfc_payment_empty_state.png
+++ b/res/drawable-mdpi/nfc_payment_empty_state.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_person_white.png b/res/drawable-xhdpi/ic_person_white.png
deleted file mode 100644
index 0200ece..0000000
--- a/res/drawable-xhdpi/ic_person_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/nfc_payment_empty_state.png b/res/drawable-xhdpi/nfc_payment_empty_state.png
index e664090..5291c22 100644
--- a/res/drawable-xhdpi/nfc_payment_empty_state.png
+++ b/res/drawable-xhdpi/nfc_payment_empty_state.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_person_white.png b/res/drawable-xxhdpi/ic_person_white.png
deleted file mode 100644
index 6a6f033..0000000
--- a/res/drawable-xxhdpi/ic_person_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/nfc_payment_empty_state.png b/res/drawable-xxhdpi/nfc_payment_empty_state.png
index a861b79..e23b0a7 100644
--- a/res/drawable-xxhdpi/nfc_payment_empty_state.png
+++ b/res/drawable-xxhdpi/nfc_payment_empty_state.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_person_white.png b/res/drawable-xxxhdpi/ic_person_white.png
deleted file mode 100644
index 9092553..0000000
--- a/res/drawable-xxxhdpi/ic_person_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/nfc_payment_empty_state.png b/res/drawable-xxxhdpi/nfc_payment_empty_state.png
new file mode 100644
index 0000000..569bb07
--- /dev/null
+++ b/res/drawable-xxxhdpi/nfc_payment_empty_state.png
Binary files differ
diff --git a/res/drawable/ic_avatar_default_1.xml b/res/drawable/ic_avatar_default_1.xml
deleted file mode 100644
index edd919a..0000000
--- a/res/drawable/ic_avatar_default_1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:width="40dp" android:height="40dp" />
-            <solid android:color="@color/pink_500" />
-        </shape>
-    </item>
-    <item android:top="8dp" android:bottom="8dp" android:left="8dp" android:right="8dp"
-            android:drawable="@drawable/ic_person_white" />
-</layer-list>
-
diff --git a/res/drawable/ic_avatar_default_2.xml b/res/drawable/ic_avatar_default_2.xml
deleted file mode 100644
index 77918a0..0000000
--- a/res/drawable/ic_avatar_default_2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:width="40dp" android:height="40dp" />
-            <solid android:color="@color/indigo_500" />
-        </shape>
-    </item>
-    <item android:top="8dp" android:bottom="8dp" android:left="8dp" android:right="8dp"
-            android:drawable="@drawable/ic_person_white" />
-</layer-list>
-
diff --git a/res/drawable/ic_avatar_default_3.xml b/res/drawable/ic_avatar_default_3.xml
deleted file mode 100644
index 49fd6c4..0000000
--- a/res/drawable/ic_avatar_default_3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:width="40dp" android:height="40dp" />
-            <solid android:color="@color/blue_500" />
-        </shape>
-    </item>
-    <item android:top="8dp" android:bottom="8dp" android:left="8dp" android:right="8dp"
-            android:drawable="@drawable/ic_person_white" />
-</layer-list>
-
diff --git a/res/drawable/ic_avatar_default_4.xml b/res/drawable/ic_avatar_default_4.xml
deleted file mode 100644
index 6992f90..0000000
--- a/res/drawable/ic_avatar_default_4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:width="40dp" android:height="40dp" />
-            <solid android:color="@color/teal_500" />
-        </shape>
-    </item>
-    <item android:top="8dp" android:bottom="8dp" android:left="8dp" android:right="8dp"
-            android:drawable="@drawable/ic_person_white" />
-</layer-list>
-
diff --git a/res/drawable/ic_avatar_default_5.xml b/res/drawable/ic_avatar_default_5.xml
deleted file mode 100644
index 2aa0db2..0000000
--- a/res/drawable/ic_avatar_default_5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:width="40dp" android:height="40dp" />
-            <solid android:color="@color/green_500" />
-        </shape>
-    </item>
-    <item android:top="8dp" android:bottom="8dp" android:left="8dp" android:right="8dp"
-            android:drawable="@drawable/ic_person_white" />
-</layer-list>
-
diff --git a/res/drawable/ic_avatar_default_6.xml b/res/drawable/ic_avatar_default_6.xml
deleted file mode 100644
index 7f9bb32..0000000
--- a/res/drawable/ic_avatar_default_6.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:width="40dp" android:height="40dp" />
-            <solid android:color="@color/light_green_500" />
-        </shape>
-    </item>
-    <item android:top="8dp" android:bottom="8dp" android:left="8dp" android:right="8dp"
-            android:drawable="@drawable/ic_person_white" />
-</layer-list>
-
diff --git a/res/drawable/ic_avatar_default_7.xml b/res/drawable/ic_avatar_default_7.xml
deleted file mode 100644
index 1c1c5f3..0000000
--- a/res/drawable/ic_avatar_default_7.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:width="40dp" android:height="40dp" />
-            <solid android:color="@color/orange_500" />
-        </shape>
-    </item>
-    <item android:top="8dp" android:bottom="8dp" android:left="8dp" android:right="8dp"
-            android:drawable="@drawable/ic_person_white" />
-</layer-list>
-
diff --git a/res/drawable/ic_avatar_default_8.xml b/res/drawable/ic_avatar_default_8.xml
deleted file mode 100644
index 478454e..0000000
--- a/res/drawable/ic_avatar_default_8.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:width="40dp" android:height="40dp" />
-            <solid android:color="@color/deep_orange_500" />
-        </shape>
-    </item>
-    <item android:top="8dp" android:bottom="8dp" android:left="8dp" android:right="8dp"
-            android:drawable="@drawable/ic_person_white" />
-</layer-list>
-
diff --git a/res/drawable/ic_avatar_guest.xml b/res/drawable/ic_avatar_guest.xml
deleted file mode 100644
index f81fe89..0000000
--- a/res/drawable/ic_avatar_guest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:width="40dp" android:height="40dp" />
-            <solid android:color="@color/grey_500" />
-        </shape>
-    </item>
-    <item android:top="8dp" android:bottom="8dp" android:left="8dp" android:right="8dp"
-            android:drawable="@drawable/ic_person_white" />
-</layer-list>
-
diff --git a/res/drawable/ic_default_user.png b/res/drawable/ic_default_user.png
deleted file mode 100644
index ddf797f..0000000
--- a/res/drawable/ic_default_user.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_print.xml b/res/drawable/ic_print.xml
new file mode 100644
index 0000000..647838d
--- /dev/null
+++ b/res/drawable/ic_print.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@*android:drawable/ic_print"
+    android:tint="@*android:color/material_deep_teal_500" />
diff --git a/res/drawable/ic_print_error.xml b/res/drawable/ic_print_error.xml
new file mode 100644
index 0000000..560aaab
--- /dev/null
+++ b/res/drawable/ic_print_error.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@*android:drawable/ic_print_error"
+    android:tint="@*android:color/material_deep_teal_500" />
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
index fd52413..8575fa6 100644
--- a/res/layout-land/choose_lock_password.xml
+++ b/res/layout-land/choose_lock_password.xml
@@ -20,7 +20,6 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:background="@android:color/background_dark"
     android:gravity="center_horizontal">
 
     <LinearLayout
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index 1fa5938..f048ba2 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -33,6 +33,7 @@
         <TextView android:id="@+id/headerText"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
+                  android:layout_marginTop="16dp"
                   android:gravity="center"
                   android:textSize="18sp"/>
 
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index ad7fbc0..4158c88 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -21,7 +21,6 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:background="@android:color/background_dark"
     android:gravity="center_horizontal">
 
     <LinearLayout
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index 6e307b1..b58b46f 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -33,6 +33,7 @@
         <TextView android:id="@+id/headerText"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
+                  android:layout_marginTop="16dp"
                   android:gravity="center"
                   android:textSize="18sp"/>
 
diff --git a/res/layout/bluetooth_device_picker.xml b/res/layout/bluetooth_device_picker.xml
index 833a7b3..16e421f 100755
--- a/res/layout/bluetooth_device_picker.xml
+++ b/res/layout/bluetooth_device_picker.xml
@@ -20,33 +20,9 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-    <LinearLayout android:id="@+id/dialog_layout"
+        <fragment android:id="@+id/bluetooth_fragment_settings"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingBottom="@dimen/bluetooth_dialog_padding"
-            style="@style/wifi_item" >
-
-            <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/bluetooth_preference_paired_dialog_name_label"
-                    android:textDirection="locale"
-                    style="@style/wifi_item_label" />
-
-            <EditText android:id="@+id/name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textNoSuggestions"
-                    android:maxLength="@integer/bluetooth_name_length"
-                    android:singleLine="true"
-                    style="@style/wifi_item_edit_content" />
-
-            <fragment android:id="@+id/bluetooth_fragment_settings"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    class="com.android.settings.bluetooth.DevicePickerFragment" />
-
-    </LinearLayout>
+            class="com.android.settings.bluetooth.DevicePickerFragment" />
 
 </LinearLayout>
diff --git a/res/layout/bluetooth_device_settings.xml b/res/layout/bluetooth_device_settings.xml
index cc2cc09..b65ca0f 100644
--- a/res/layout/bluetooth_device_settings.xml
+++ b/res/layout/bluetooth_device_settings.xml
@@ -20,34 +20,9 @@
         android:orientation="vertical"
         android:gravity="center">
 
-    <LinearLayout android:id="@+id/dialog_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingBottom="@dimen/bluetooth_dialog_padding"
-            style="@style/bt_item" >
-
-            <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/bluetooth_preference_paired_dialog_name_label"
-                    android:textDirection="locale"
-                    android:textColor="?android:attr/colorAccent"
-                    style="@style/bt_item_label" />
-
-            <EditText android:id="@+id/name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textNoSuggestions"
-                    android:maxLength="@integer/bluetooth_name_length"
-                    android:singleLine="true"
-                    style="@style/bt_item_edit_content" />
-
             <fragment android:id="@+id/bluetooth_fragment_settings"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     class="com.android.settings.bluetooth.DeviceProfilesSettings" />
 
-    </LinearLayout>
-
 </LinearLayout>
diff --git a/res/layout/bluetooth_device_settings_header.xml b/res/layout/bluetooth_device_settings_header.xml
new file mode 100644
index 0000000..b1832c5
--- /dev/null
+++ b/res/layout/bluetooth_device_settings_header.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center">
+
+    <LinearLayout android:id="@+id/dialog_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="@dimen/bluetooth_dialog_padding"
+            style="@style/bt_item" >
+
+            <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/bluetooth_preference_paired_dialog_name_label"
+                    android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:textDirection="locale"
+                    style="@style/bt_item_label" />
+
+            <EditText android:id="@+id/name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textNoSuggestions"
+                    android:maxLength="@integer/bluetooth_name_length"
+                    android:singleLine="true"
+                    style="@style/bt_item_edit_content" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/bluetooth_preference_category.xml b/res/layout/bluetooth_preference_category.xml
new file mode 100644
index 0000000..2b9a29a
--- /dev/null
+++ b/res/layout/bluetooth_preference_category.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Layout used for Bluetooth PreferenceCategory in a DeviceProfilesSettings. -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+android:id/title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="@android:style/TextAppearance.Material.Body1"
+    android:textColor="?android:attr/textColorSecondary"
+    android:paddingTop="16dip"
+    android:paddingStart="16dip"
+    android:paddingBottom="16dip" />
diff --git a/res/layout/confirm_lock_pattern.xml b/res/layout/confirm_lock_pattern.xml
index f11f5ae..4426242 100644
--- a/res/layout/confirm_lock_pattern.xml
+++ b/res/layout/confirm_lock_pattern.xml
@@ -27,21 +27,11 @@
         android:gravity="center"
         android:textSize="18sp"/>
 
-    <View
-         android:background="@*android:drawable/code_lock_top"
-         android:layout_width="match_parent"
-         android:layout_height="2dip" />
-
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
          android:layout_width="match_parent"
          android:layout_height="match_parent"
          android:background="@color/lock_pattern_background" />
 
-    <View
-         android:background="@*android:drawable/code_lock_bottom"
-         android:layout_width="match_parent"
-         android:layout_height="8dip" />
-
     <TextView android:id="@+id/footerText"
         android:layout_width="match_parent"
         android:layout_height="0dip"
@@ -49,5 +39,4 @@
         android:gravity="center"
         android:textSize="14sp"/>
 
-
 </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout/edit_user_info_dialog_content.xml b/res/layout/edit_user_info_dialog_content.xml
index d23f6f5..4d76e13 100644
--- a/res/layout/edit_user_info_dialog_content.xml
+++ b/res/layout/edit_user_info_dialog_content.xml
@@ -26,7 +26,7 @@
         android:layout_height="56dip"
         android:layout_gravity="bottom"
         android:layout_marginEnd="6dp"
-        android:contentDescription="@null"
+        android:contentDescription="@string/user_image_photo_selector"
         android:background="@*android:drawable/spinner_background_holo_dark"
         android:scaleType="fitCenter"/>
 
diff --git a/res/layout/preference_bt_icon.xml b/res/layout/preference_bt_icon.xml
new file mode 100644
index 0000000..2c05cfe
--- /dev/null
+++ b/res/layout/preference_bt_icon.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:gravity="center_vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:background="?android:attr/selectableItemBackground">
+
+    <ImageView
+        android:id="@+android:id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
+        android:layout_gravity="center"
+        android:contentDescription="@null" />
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_marginStart="15dip"
+        android:paddingTop="16dip"
+        android:paddingBottom="16dip">
+
+        <TextView
+            android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+            android:textColor="?android:attr/textColorPrimary"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:visibility="gone"
+            android:textAlignment="viewStart"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="10" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:minWidth="58dip"
+        android:gravity="end|center_vertical"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index 5859fbf..1776fec 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -31,6 +31,7 @@
         android:background="@null"
         android:id="@+android:id/title"
         android:paddingStart="0dp"
+        android:paddingTop="6dp"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -40,6 +41,7 @@
     <ProgressBar
         android:id="@+id/scanning_progress"
         android:text="@string/progress_scanning"
+        android:paddingTop="6dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/res/layout/trusted_credentials.xml b/res/layout/trusted_credentials.xml
index dbb1b34..6be0ba2 100644
--- a/res/layout/trusted_credentials.xml
+++ b/res/layout/trusted_credentials.xml
@@ -59,6 +59,16 @@
                     android:visibility="gone">
                 </ListView>
 
+                <ExpandableListView
+                    android:id="@+id/system_expandable_list"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                    android:scrollbarStyle="outsideOverlay"
+                    android:visibility="gone">
+                </ExpandableListView>
+
             </FrameLayout>
 
             <FrameLayout
@@ -85,6 +95,16 @@
                     android:visibility="gone">
                 </ListView>
 
+                <ExpandableListView
+                    android:id="@+id/user_expandable_list"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                    android:scrollbarStyle="outsideOverlay"
+                    android:visibility="gone">
+                </ExpandableListView>
+
             </FrameLayout>
 
         </FrameLayout>
diff --git a/res/layout/wifi_assistant_card.xml b/res/layout/wifi_assistant_card.xml
index bbfc3f3..28756a0 100644
--- a/res/layout/wifi_assistant_card.xml
+++ b/res/layout/wifi_assistant_card.xml
@@ -69,22 +69,13 @@
 
         <Button
             android:id="@+id/no_thanks_button"
-            android:background="@android:color/white"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
             android:text="@string/wifi_assistant_no_thanks"
-            android:paddingLeft="@dimen/wifi_assistant_text_padding"
-            android:paddingRight="@dimen/wifi_assistant_text_padding" />
+            style="@style/WifiAssistantButton.Negative" />
 
         <Button
             android:id="@+id/setup"
-            android:background="@android:color/white"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:paddingLeft="@dimen/wifi_assistant_text_padding"
-            android:paddingRight="@dimen/wifi_assistant_text_padding"
             android:text="@string/wifi_assistant_setup"
-            style="@style/WifiAssistantButton" />
+            style="@style/WifiAssistantButton.Positive" />
 
     </LinearLayout>
 
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 077134e..b7b20c7 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -16,7 +16,8 @@
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
          android:layout_width="wrap_content"
-         android:layout_height="wrap_content">
+         android:layout_height="wrap_content"
+         android:fadeScrollbars="false">
 
     <LinearLayout
             android:layout_width="match_parent"
@@ -49,7 +50,7 @@
              <LinearLayout
                        style="@style/wifi_item" >
                  <TextView
-                         style="@style/wifi_item_content"
+                         style="@style/wifi_item_label"
                          android:text="@string/wifi_security" />
 
                  <Spinner android:id="@+id/security"
@@ -148,8 +149,6 @@
                        style="@style/wifi_item" >
                 <TextView
                         style="@style/wifi_item_label"
-                        android:textAppearance="@android:style/TextAppearance.Material.Body2"
-                        android:textColor="?android:attr/colorAccent"
                         android:text="@string/wifi_password" />
 
                 <EditText android:id="@+id/password"
diff --git a/res/layout/zen_downtime_day.xml b/res/layout/zen_downtime_day.xml
index 076ad4c..8d2fa73 100755
--- a/res/layout/zen_downtime_day.xml
+++ b/res/layout/zen_downtime_day.xml
@@ -20,6 +20,4 @@
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:gravity="center_vertical"
-    android:paddingStart="@dimen/zen_downtime_checkbox_padding"
-    android:layout_marginStart="@dimen/zen_downtime_margin"
-    android:layout_marginEnd="@dimen/zen_downtime_margin" />
+    android:paddingStart="@dimen/zen_downtime_checkbox_padding" />
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 32986b2..1c3970e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Saambindingsversoek"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Raak om saam te bind aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Wys ontvangde lêers"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Kieser vir Bluetooth-toestelle"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-toestemmingsversoek"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"\'n Program wil Bluetooth aanskakel."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"\'n Program wil jou tablet sigbaar maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Omdat die Stelsel Skoonmaak-diens nie beskikbaar was nie, is geen terugstel gedoen nie."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Stel terug?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Fabriekterugstelling is nie vir hierdie gebruiker beskikbaar nie"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Vee tans uit"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Wag asseblief …"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Vee USB-berging uit"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Vee SD-kaart uit"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Vee alle data in USB-berging uit"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Kopiereg"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensie"</string>
     <string name="terms_title" msgid="7697580845616764642">"Bepalings en voorwaardes"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Oopbronlisensies"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Daar was \'n probleem om lisensies te loods."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Laai tans…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Jy moet \'n sluitskerm-PIN of -wagwoord stel voordat jy eiebewysberging kan gebruik."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Programme met gebruiktoegang"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Laat toegang toe?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"As jy toegang toelaat, kan hierdie program algemene inligting oor die programme op jou toestel bekyk, soos hoe gereeld jy hulle gebruik."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Noodtoon"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Stel gedrag wanneer \'n noodoproep gemaak word"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Rugsteun en terugstelling"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Agtergrondproses-limiet"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Wys alle ANRe"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Wys Program reageer nie-dialoog vir agtergrond programme"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Gebruik Google-instellingprogram vir hierdie bewerking"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Minder WebView-netgebruik"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Verminder netwerkgebruik deur Google-kompressiebedieners vir WebView-verbindings te laat instaan"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Programdatagebruik"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Diensverskaffer se datarekeninge kan van jou toestel verskil."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"As hierdie instelling aangeskakel is, kan jy die toestel in \'n staat stel wat die huidige skerm in sig hou.\n\nOm \'n skerm vas te speld:\n\n1. Skakel hierdie instelling aan.\n\n2. Maak \'n program oop.\n\n3. Raak die Onlangse programme-knoppie.\n\n4. Raak die speldikoon."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Werkprofiel"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimenteel)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Wanneer toestel gedraai word"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Draai die skerm se inhoud"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Bly in portretaansig"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Bly in landskapaansig"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Bly in huidige oriëntasie"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 04f3b39..1d11988 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ማጣመሪያ ጥየቃ"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"ከ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር ለማጣመር ንካ።"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"የደረሱ ፋይሎችን አሳይ"</string>
-    <string name="device_picker" msgid="8398232791303186677">"የብሉቱዝ መሣሪያ መራጭ"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"የብሉቱዝ ፈቃድ ጥየቃ"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"አንድ መተግበሪያ ብሉቱዝን ማብራት ይፈልጋል።"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"አንድ መተግበሪያ ጡባዊዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"የስርዓቱ አገልግሎት አጽዳ ስላልተገኘ ዳግም ለማስጀመር ምንም አልተከናወነም።"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ዳግም ይቀናበር?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"የፋብሪካ ዳግም ማስጀመር ለዚህ ተጠቃሚ አይገኝም"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"በማጥፋት ላይ"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"እባክዎ ይጠብቁ..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB ማከማቻ አጥፋ"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"የSD ካርድ አጥፋ"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"በUSB ማከማቻ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"የቅጂ መብት"</string>
     <string name="license_title" msgid="1990487604356037871">"ፍቃድ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ውሎች እና ደንቦች"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"የነፃ ምንጭ  ፈቃዶች"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ፈቃዶቹንበመስቀል ላይ ችግር ነበር።"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"በመስቀል ላይ…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"የማስረጃ ማከማቻ ከመጠቀምህ በፊት የማያ ፒን ወይም ይለፍ ቃል ቆልፍ ማዘጋጀት አለብህ።"</string>
     <string name="usage_access_title" msgid="332333405495457839">"የአጠቃቀም መዳረሻ ያላቸው መተግበሪያዎች"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"መዳረሻ ይፈቀድ?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"መዳረሻ ከፈቀዱ ይህ መተግበሪያ እንደ ምን ያህል ጊዜ እንደሚጠቀሙባቸው ያለ በመሣሪያዎ ላይ ያሉ የመተግበሪያዎች አጠቃላይ መረጃ መመልከት ይችላል።"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"የአደጋ ጊዜ ድምፅ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"የአደጋጊዜ ጥሪ ሲደረግ ባህሪ አዘጋጅ"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"መጠበቂያ እና ዳግም አስጀምር"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"የዳራ አሂድ ወሰን"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"ሁሉንም ANRs አሳይ"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"ለዳራ ትግበራዎች ምላሽ የማይሰጥ መገናኛ ትግበራ አሳይ"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"እባክዎ ለዚህ ክወና የGoogleSettings መተግበሪያውን ይጠቀሙ"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"የWebView አውታረ መረብ አጠቃቀም ይቀንሱ"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"የWebView ግንኙነቶችን በGoogle አማቂ አገልጋዮች በኩል በማስሄድ የአውታረ መረብ አጠቃቀም ይቀንሱ"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"የውሂብ አጠቃቀም"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"የመተግበሪያ ውሂብ አጠቃቀም"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"የአገልግሎት አቅራቢ ውሂብ አቆጣጠር ከየመሣሪያዎ ሊለይ ይችላል።"</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"ይህ ቅንብር ሲበራ መሣሪያው የአሁኑን ማያ ገጽ በእይታ ውስጥ በሚያቆይ መልኩ ሊያደርጉት ይችላሉ።\n\nአንድ ማያ ገጽ ለመሰካት፦\n\n1. ይህን ቅንብር ያብሩት።\n\n2. አንድ መተግበሪያ ይክፈቱ።\n\n3. የቅርብ ጊዜዎቹ አዝራር ይንኩ።\n\n4. የሚስማር አዶውን ይንኩ።"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"የስራ መገለጫ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(የሙከራ)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"መሣሪያው ሲዞር"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"የማያ ገጹን ይዘቶች ያዙሩ"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"በቁም እይታ ላይ ቆይ"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"በወርድ እይታ ላይ ቆይ"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"በአሁኑ አቀማመጠ-ገጽ ላይ ቆይ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ab106d1..ed5d2b4 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"طلب اقتران"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"المس للإقران مع <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"إظهار الملفات المستلمة"</string>
-    <string name="device_picker" msgid="8398232791303186677">"منتقي جهاز البلوتوث"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"طلب إذن بلوتوث"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"يريد أحد التطبيقات تشغيل بلوتوث."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"يريد أحد التطبيقات أن يجعل جهازك اللوحي مرئيًا لأجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
@@ -1136,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"حقوق الطبع والنشر"</string>
     <string name="license_title" msgid="1990487604356037871">"الترخيص"</string>
     <string name="terms_title" msgid="7697580845616764642">"البنود والشروط"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"تراخيص البرامج مفتوحة المصدر"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"هناك مشكلة في تحميل التراخيص."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"جارٍ التحميل…"</string>
@@ -2468,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"عند تشغيل هذا الإعداد، ستتمكن من إدخال جهازك في حالة تظل من خلالها الشاشة الحالية معروضة.\n\nلتثبيت شاشة ما:\n\n1- مكِّن هذا الإعداد.\n\n2- افتح تطبيقًا.\n\n3- المس زر \"العناصر الأخيرة\".\n\n4. المس رمز التثبيت."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"الملف الشخصي للعمل"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(تجريبي)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"أوقات تدوير الجهاز"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"تدوير محتويات الشاشة"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"الاحتفاظ بالعرض العمودي"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"الاحتفاظ بالعرض الأفقي"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"الاحتفاظ بالاتجاه الحالي"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 4d202b9..493220a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Заявка за сдвояване"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Докоснете за сдвояване със: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показване на получени файлове"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Инструмент за избор на устройство с Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Заявка за разрешение на Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Приложение иска да включи Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Приложение иска да направи таблета ви видим за други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Не се състоя рестартиране, защото услугата за изчистване на системата не се предлага."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Да се зададе ли повторно?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"За този потребител не е налице възстановяване на фабричните настройки"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Изтрива се"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Моля, изчакайте..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Изтриване на USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Изтриване на SD картата"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Изтрива всички данни в USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Авторски права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценз"</string>
     <string name="terms_title" msgid="7697580845616764642">"Общи условия"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лицензи с отворен код"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Възникна проблем при зареждането на лицензите."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Зарежда се…"</string>
@@ -2470,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Когато тази настройка е включена, можете да поставите устройството в състояние, при което текущият екран остава видим.\n\nЗа да фиксирате екран:\n\n1. Включете тази настройка.\n\n2. Отворете приложение.\n\n3. Докоснете бутона „Скорошни“.\n\n4. Докоснете иконата за фиксиране."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Служебен потр. профил"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"При завъртане на устройството"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Завъртане на съдържанието на екрана"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Оставане във вертикален изглед"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Оставане в хоризонтален изглед"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Оставане в текущата ориентация"</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 3363a1e..ee427c4 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"যুক্ত করার অনুরোধ"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সঙ্গে যুক্ত করতে স্পর্শ করুন"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"পাওয়া ফাইলগুলি দেখান"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth ডিভাইস চয়নকারী"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth অনুমতির অনুরোধ"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"একটি অ্যাপ্লিকেশান Bluetooth চালু করতে চাইছে।"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"একটি অ্যাপ্লিকেশান আপনার ট্যাবলেটকে অন্যান্য Bluetooth ডিভাইসের কাছে <xliff:g id="TIMEOUT">%1$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"সিস্টেম সাফ করুন পরিষেবাটি উপলব্ধ না থাকার কারণে কোনো পুনরায় সেট করুন নির্দেশ সঞ্চালনা করা যায়নি।"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"পুনরায় সেট করবেন?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"এই ব্যবহারকারীর জন্য ফ্যাক্টরি রিসেট উপলব্ধ নেই"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"মোছা হচ্ছে"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"দয়া করে অপেক্ষা করুন..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB সঞ্চয়স্থান মুছে ফেলুন"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD কার্ড মুছে ফেলুন"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB সঞ্চয়স্থানের সব ডেটা মুছে দেয়"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"কপিরাইট"</string>
     <string name="license_title" msgid="1990487604356037871">"লাইসেন্স"</string>
     <string name="terms_title" msgid="7697580845616764642">"চুক্তি এবং শর্তাবলী"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"মুক্ত উৎস লাইসেন্স"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"লাইসেন্সগুলি লোড হতে একটা সমস্যা হয়েছে।"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"লোড হচ্ছে..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"আপনি ক্রেডেনশিয়াল সঞ্চয়স্থান ব্যবহার করার আগে আপনাকে লক স্ক্রীন PIN বা পাসওয়ার্ড সেট করতে হবে।"</string>
     <string name="usage_access_title" msgid="332333405495457839">"ব্যবহারের অ্যাক্সেস যুক্ত অ্যাপ্লিকেশান"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"অ্যাক্সেসের অনুমতি দেবেন?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"আপনি অ্যাক্সেস করতে অনুমতি দিলে, এই অ্যাপ্লিকেশানটি আপনার অ্যাপ্লিকেশানগুলি সম্পর্কে সাধারণ তথ্য যেমন, আপনি কত ঘনঘন সেগুলো ব্যবহার করেন তা দেখতে পারবে।"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"জরুরি টোন"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"জরুরি কল স্থাপন করা সময় কি ধরণের কার্যকলাপ করবে তা সেট করুন"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"ব্যাকআপ ও পুনরায় সেট করুন"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"পশ্চাদপট প্রক্রিয়ার সীমা"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"সব ANR দেখান"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"পশ্চাদপটের অ্যাপ্লিকেশানগুলির জন্য অ্যাপ্লিকেশান কোনো প্রতিক্রিয়া দিচ্ছে না এমন কথোপকথন দেখান"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"এই অপারেশনের জন্য GoogleSettings অ্যাপ্লিকেশন ব্যবহার করুন"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView নেটওয়ার্কের ব্যবহার কমান"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Google এর সংকোচন সার্ভারগুলি ব্যবহার করে WebView সংযোগগুলির প্রক্সি করার মাধ্যমে নেটওয়ার্কের ব্যবহার কমান"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ডেটা ব্যবহার"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"অ্যাপ্লিকেশান ডেটা ব্যবহার"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"পরিষেবা প্রদানকারীর ডেটার হিসাব আপনার ডিভাইস থেকে ভিন্ন হতে পারে।"</string>
@@ -2197,7 +2197,7 @@
     <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="2108112641783146007">"নতুন ব্যবহারকারী জুড়বেন?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"আপনি অতিরিক্ত ব্যবহারকারী তৈরি করে অন্যান্য ব্যক্তির সঙ্গে এই ডিভাইস ভাগ করতে পারেন। প্রত্যেক ব্যবহারকারীর নিজস্ব জায়গা থাকে যেগুলি তারা তাদের নিজস্ব অ্যাপ্লিকেশান, ওয়ালপেপার এবং আরো অনেক কিছু দিয়ে কাস্টমাইজ করতে পারেন। এছাড়াও, ব্যবহারকারীরা Wi‑Fi এর মত ডিভাইস সেটিংস সামঞ্জস্যপূর্ণ করতে পারবেন যা প্রত্যেককে প্রভাবিত করবে।\n\nআপনি একজন নতুন ব্যবহারকারী জুড়লে তাকে তার জায়গা সেট আপ করে নিতে হবে।\n\nযেকোনো ব্যবহারকারী অন্য সব ব্যবহারকারীর জন্য অ্যাপ্লিকেশান আপডেট করতে পারবেন।"</string>
+    <string name="user_add_user_message_long" msgid="718192651887726259">"আপনি একাধিক ব্যবহারকারী তৈরি করে অন্যদের সাথে এই ডিভাইস শেয়ার করতে পারেন। প্রতিটি ব্যবহারকারী তাদের নিজস্ব স্থান রয়েছে যা তারা অ্যাপ্লিকেশান, ওয়ালপেপার, এবং আরো অনেক কিছু দিয়ে কাস্টমাইজ করতে পারেন। ব্যবহারকারীরা Wi‑Fi এর মত ট্যাবলেট সেটিংস সামঞ্জস্য করতে পারবেন যার প্রভাব পড়বে সকলের উপর।\n\nনতুন ব্যবহারকারী তৈরি হওয়ার পরে,সেট আপ প্রক্রিয়া সম্পূর্ণ করতে হবে।\n\nঅন্যান্য ব্যবহারকারীদের হয়ে যে কোনো ব্যবহারকারী আপডেট করা অ্যাপ্লিকেশান অনুমতিগুলি গ্রহণ করতে পারবেন।"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"আপনি একজন নতুন ব্যবহারকারী জুড়লে তাকে তার জায়গা সেট আপ করে নিতে হবে।\n\nযেকোনো ব্যবহারকারী অন্য সব ব্যবহারকারীর জন্য অ্যাপ্লিকেশান আপডেট করতে পারবেন।"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"এখন ব্যবহারকারী সেট আপ করবেন?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"নিশ্চিত করুন যে ব্যক্তিটি ডিভাইসটি নেওয়ার জন্য এবং তার স্থান সেট আপ করার জন্য উপলব্ধ আছেন"</string>
@@ -2208,7 +2208,7 @@
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"শুধুমাত্র ফোনের মালিক ব্যবহারকারীদের পরিচালনা করতে পারেন।"</string>
     <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_add_on_lockscreen_menu" msgid="3025132738715222247">"ডিভাইস লক করা অবস্থায় ব্যবহারকারী জুড়ুন"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"ফোন লক থাকালেও ব্যবহারকারী জুড়ুন"</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>
@@ -2392,7 +2392,7 @@
     <string name="notification_ringtone_title" msgid="3361201340352664272">"বিজ্ঞপ্তির ডিফল্ট রিংটোন"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"এছাড়াও কল এলে স্পন্দিত করুন"</string>
     <string name="notification_section_header" msgid="95661783916799134">"বিজ্ঞপ্তি"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"পালস বিজ্ঞপ্তি আলো"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"পাল্স বিজ্ঞপ্তির জন্য আলো"</string>
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"যখন ডিভাইস লক থাকবে"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"সমস্ত বিজ্ঞপ্তির সামগ্রীগুলি দেখান"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"সংবেদনশীল বিজ্ঞপ্তির সামগ্রী লুকান"</string>
@@ -2468,7 +2468,12 @@
     <string name="switch_on_text" msgid="1124106706920572386">"চালু করুন"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"বন্ধ করুন"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"স্ক্রীন পিন করা"</string>
-    <string name="screen_pinning_description" msgid="3022868253807792488">"যখন সেটিংস চালু থাকে, তখন আপনি ডিভাইসটিকে এমন অবস্থায় রাখতে পারেন যা বর্তমান স্ক্রীনটিকে প্রদর্শনে রাখে।\n\n একটি স্ক্রীন পিন করতে:\n\n১. এই সেটিংটি চালু করুন।\n\n২. একটি অ্যাপ্লিকেশান খুলুন।\n\n৩. যে বোতামটি স্পর্শ সাম্প্রতিক কার্যকলাপ দেখায় সেটিতে স্পর্শ করুন।\n\n৪. পিন আইকনে স্পর্শ করুন।"</string>
+    <string name="screen_pinning_description" msgid="3022868253807792488">"যখন সেটিংস চালু থাকে, তখন আপনি ডিভাইসটিকে এমন অবস্থায় রাখতে পারেন যা বর্তমান স্ক্রীনটিকে প্রদর্শনে রাখে।\n\n একটি স্ক্রীন পিন করতে:\n\n১. এই সেটিংটি চালু করুন।\n\n২. একটি অ্যাপ্লিকেশান খুলুন।\n\n৩. সাম্প্রতিক স্পর্শ করা বোতামটি দেখায়।\n\n৪. পিন আইকনে স্পর্শ করুন।"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"কর্মস্থলের প্রোফাইল"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(পরীক্ষামূলক)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"ডিভাইস যখন ঘোরানো হবে"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"স্ক্রীনের সামগ্রীগুলি ঘোরান"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"প্রতিকৃতি দৃশ্যে থাকুন"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ভূদৃশ্য দৃশ্যে থাকুন"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"বর্তমান সজ্জায় থাকুন"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a176075..9edab60 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Sol·licitud d\'emparellament"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toca per emparellar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra els fitxers rebuts"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Selector de dispositiu Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Sol·licitud de permís de Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Una aplicació vol activar el Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Una aplicació vol que la tauleta sigui visible per a la resta de dispositius amb Bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"No s\'ha restablert perquè el servei d\'esborrament del sistema no està disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Restablir?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"El restabliment de fàbrica no està disponible per a aquest usuari."</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"S\'està esborrant"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Espera…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Esborra l\'emmagatzematge USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Esborra la targeta SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Esborra totes les dades de l\'emmagatzematge USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Llicència"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termes i condicions"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Llicències de codi obert"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"S\'ha produït un problema en llegir les llicències."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"S\'està carregant…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Has d\'establir un PIN o una contrasenya a la pantalla de bloqueig per poder fer servir l\'emmagatzematge de credencials."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplicacions amb accés d\'ús"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Vols permetre\'n l\'accés?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Si permets l\'accés a aquesta aplicació, podrà mostrar informació general sobre les aplicacions del dispositiu, com ara la freqüència amb què les fas servir."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"To d\'emergència"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Defineix el comportament quan es fa una trucada d\'emergència"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Còpia de seguretat i restauració"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Límita processos en segon pla"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Tots els errors sense resposta"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Informa que una aplicació en segon pla no respon"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Fes servir l\'aplicació Configuració Google per a aquesta operació"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Red. ús xarxa de WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Redueix l\'ús de la xarxa fent servir connexions WebView amb un servidor intermediari mitjançant servidors de compressió de Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Ús de dades"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ús de dades de l\'aplic."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del del dispositiu."</string>
@@ -2258,7 +2258,7 @@
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Suprimeix restriccions"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Canvia el PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostra les notificacions"</string>
-    <string name="help_label" msgid="6886837949306318591">"Ajuda i comentaris"</string>
+    <string name="help_label" msgid="6886837949306318591">"Ajuda i suggeriments"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Compte per al contingut"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Identificador de la foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Amenaces extremes"</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Si aquesta opció de configuració està activada, pots fer que el dispositiu fixi la pantalla actual.\n\nPer fixar una pantalla, fes el següent:\n\n1. Activa aquesta opció de configuració.\n\n2. Obre una aplicació.\n\n3. Toca el botó Recents.\n\n4. Toca la icona de fixar."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Perfil professional"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Quan el dispositiu està girat"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Gira el contingut de la pantalla"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Continua amb l\'orientació vertical"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Continua amb l\'orientació horitzontal"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Continua amb l\'orientació actual"</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index a7d7f95..4468dff 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -374,7 +374,7 @@
     <item msgid="8342334626783983353">"100 %"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"Použít výchozí nastavení aplikace"</item>
+    <item msgid="7009918361545506251">"Použít výchozí"</item>
     <item msgid="1770533843436933500">"Bílé na černém"</item>
     <item msgid="758587126802411846">"Černé na bílém"</item>
     <item msgid="1495307195241623402">"Žluté na černém"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9b6249f..daa4e77 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Požadavek na párování"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Klepnutím spárujete se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobrazit přijaté soubory"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Výběr zařízení Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Požadavek na povolení zařízení Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikace chce zapnout Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikace požaduje zviditelnění tabletu pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
@@ -285,10 +286,10 @@
     <string name="settings_label" msgid="1626402585530130914">"Nastavení"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavení"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Zástupce nastavení"</string>
-    <string name="airplane_mode" msgid="8837269988154128601">"Režim V letadle"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"Režim Letadlo"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Další"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezdrátová připojení a sítě"</string>
-    <string name="radio_controls_summary" msgid="2837395036275123133">"Správa sítí Wi-Fi, rozhraní Bluetooth, režimu V letadle, mobilních sítí a sítí VPN"</string>
+    <string name="radio_controls_summary" msgid="2837395036275123133">"Správa sítí Wi-Fi, rozhraní Bluetooth, režimu Letadlo, mobilních sítí a sítí VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobilní data"</string>
     <string name="calls_title" msgid="3544471959217176768">"Volání"</string>
     <string name="sms_messages_title" msgid="3188611825992624879">"Zprávy SMS"</string>
@@ -382,7 +383,7 @@
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="3775740783651700375">"Zadané heslo je správné, avšak data jsou poškozena.\n\nChcete-li tablet nadále používat, je nutné v něm obnovit tovární nastavení. Když poté tablet nastavíte, bude možné obnovit veškerá data zálohovaná na váš účet Google."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="6898436151871328007">"Zadané heslo je správné, avšak data jsou poškozena. \n\nChcete-li telefon nadále používat, je nutné v něm obnovit tovární nastavení. Když poté telefon nastavíte, bude možné obnovit veškerá data zálohovaná na váš účet Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Přepnout metodu zadávání"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Vybrat zámek obrazovky"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zámek obrazovky"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Výběr záložního zámku"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zámek obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Změna zámku obrazovky"</string>
@@ -461,9 +462,9 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Správa zařízení"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Správci zařízení"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Zobrazit nebo deaktivovat správce zařízení"</string>
-    <string name="manage_trust_agents" msgid="4629279457536987768">"Zástupci důvěryhodnosti"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"Agenti důvěry"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Před použitím nejdříve nastavte zámek obrazovky"</string>
-    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Zobrazit nebo deaktivovat zástupce důvěryhodnosti"</string>
+    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Zobrazit nebo deaktivovat agenty důvěry"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Zapnout Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -511,8 +512,8 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Zrušit párování"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Odpojit a zrušit párování"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Možnosti"</string>
-    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Pokročilé"</string>
-    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Pokročilé nastavení Bluetooth"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Rozšířené nastavení"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Rozšířené nastavení Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Když je zapnutá funkce Bluetooth, zařízení může komunikovat s ostatními zařízeními Bluetooth v okolí."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Připojit k síti…"</string>
     <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Zvuk médií"</string>
@@ -558,22 +559,22 @@
     <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Představujeme\nasistenta Wi-Fi"</string>
     <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"NE, DĚKUJI"</string>
     <string name="wifi_assistant_setup" msgid="3772423650475730906">"NASTAVIT"</string>
-    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Připojte se k dostupným sítím automaticky pomocí aplikace Wi-Fi Assistant."</string>
-    <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistent připojení Wi‑Fi"</string>
+    <string name="wifi_assistant_card_message" msgid="107811647784658536">"Připojte se k dostupným sítím automaticky pomocí aplikace Google Wi-Fi Assistant."</string>
+    <string name="wifi_assistant_title" msgid="2553267316621598101">"Google Wi‑Fi Assistant"</string>
     <string name="wifi_assistant_title_message" msgid="1270518944209872345">"Aplikace Google Wi‑Fi Assistant vás automaticky připojí k nejlepší dostupné síti Wi-Fi."</string>
     <string name="wifi_assistant_explanation_message" msgid="4242611602422534795">"Aplikace Google Wi‑Fi Assistant zjistí dostupné sítě a připojí vaše zařízení k nejrychlejší a nejspolehlivější síti."</string>
     <string name="wifi_assistant_vpn_message" msgid="5474437939154729312">"Za účelem ochrany vašich dat může aplikace Google Wi‑Fi Assistant poskytovat bezpečné připojení VPN prostřednictvím serverů Google."</string>
     <string name="wifi_assistant_activity_no_thanks" msgid="611984000647643330">"Ne, děkuji"</string>
     <string name="wifi_assistant_activity_yes" msgid="529603077646719710">"ANO, AKTIVOVAT"</string>
     <string name="wifi_assistant_dialog_title" msgid="9130141448000161787">"Žádost o připojení"</string>
-    <string name="wifi_assistant_dialog_message" msgid="6483823815004886979">"Aplikace Wi‑Fi Assistant žádá o nastavení připojení VPN, pomocí kterého bude moci sledovat síťový provoz. Povolte, jen pokud zdroji důvěřujete."</string>
+    <string name="wifi_assistant_dialog_message" msgid="6483823815004886979">"Google Wi‑Fi Assistant žádá o nastavení připojení VPN, pomocí kterého bude moci sledovat síťový provoz. Povolte, jen pokud zdroji důvěřujete."</string>
     <string name="wifi_assistant_dialog_notice" msgid="7459835068779476953">": když je síť VPN aktivní, zobrazuje se v horní části obrazovky."</string>
     <string name="wifi_assistant_accept" msgid="7669587061174451722">"PŘIJMOUT"</string>
     <string name="wifi_assistant_deny" msgid="7052767926493128944">"ODMÍTNOUT"</string>
     <string name="wifi_assistant_network_title" msgid="5870092585963985624">"Monitorování sítě"</string>
     <string name="wifi_assistant_permission_accepted" msgid="577392827888043634">"Aplikaci Google Wi-Fi Assistant jste udělili oprávnění k nastavení připojení VPN. To znamená, že aplikace smí sledovat síťový provoz."</string>
     <string name="wifi_assistant_open_app" msgid="4803044899535675063">"SPUSTIT APLIKACI"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Vzdálená obrazovka"</string>
+    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Odesílání obrazovky"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Povolit bezdrátový displej"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V okolí nebyla nalezena žádná zařízení."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Připojování"</string>
@@ -602,12 +603,12 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavení Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Umožňuje nastavit a spravovat přístupové body bezdrátové sítě"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Vybrat síť Wi-Fi"</string>
-    <string name="wifi_select_network" msgid="4210954938345463209">"Vybrat síť Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Vyberte síť Wi-Fi"</string>
+    <string name="wifi_select_network" msgid="4210954938345463209">"Vyberte síť Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Zapínání Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Vypínání Wi‑Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Chyba"</string>
-    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Při režimu V letadle"</string>
+    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Při režimu Letadlo"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nelze hledat sítě"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Oznamování sítě"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Upozornit, když bude dostupná veřejná síť"</string>
@@ -619,11 +620,11 @@
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Povolit službě určování polohy Google a ostatním aplikacím hledat sítě, i když je síť Wi-Fi vypnutá"</string>
     <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Automaticky spravovat připojení Wi‑Fi"</string>
     <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Nechat nástroj <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> spravovat připojení Wi-Fi"</string>
-    <string name="wifi_assistant_setting_title" msgid="7891352922976664256">"Asistent připojení Wi‑Fi"</string>
+    <string name="wifi_assistant_setting_title" msgid="7891352922976664256">"Google Wi‑Fi Assistant"</string>
     <string name="wifi_assistant_setting_summary" msgid="8436161813951180466">"Google Wi‑Fi Assistant"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalace certifikátů"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Za účelem zvýšení přesnosti a k dalším účelům mohou aplikace Google a další aplikace vyhledávat sítě Wi-Fi v okolí, i když je Wi-Fi vypnuta. Chcete-li to zakázat, přejděte do části Pokročilé &gt; Hledání vždy zapnuto."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikace mohou vyhledávat sítě v okolí i v případě, že je Wi-Fi vypnuta. Chcete-li nastavení změnit, přejděte do části Pokročilé &gt; Hledání vždy zapnuto."</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Za účelem zvýšení přesnosti a k dalším účelům mohou aplikace Google a další aplikace vyhledávat sítě Wi-Fi v okolí, i když je Wi-Fi vypnuta. Chcete-li toto zakázat, přejděte do nabídky Wi-Fi &gt; Rozšířené nastavení &gt; Hledání vždy zapnuto."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikace mohou vyhledávat sítě v okolí i v případě, že je Wi-Fi vypnuta. Chcete-li nastavení změnit, přejděte do nabídky Rozšířené nastavení &gt; Hledání vždy zapnuto."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Tuto zprávu příště nezobrazovat"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi aktivní i v režimu spánku"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi aktivní i v režimu spánku"</string>
@@ -639,7 +640,7 @@
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Zadání kódu WPS PIN"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhledávání"</string>
-    <string name="wifi_menu_advanced" msgid="7522252991919573664">"Pokročilé"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"Rozšířené nastavení"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Připojit k síti"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstranit záznam sítě"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upravit síť"</string>
@@ -665,7 +666,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Chyba ověření. Zkuste to prosím znovu."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Byla zjištěna další relace WPS. Zkuste prosím to znovu za několik minut."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Identifikátor SSID sítě"</string>
-    <string name="wifi_ssid_hint" msgid="897593601067321355">"Zadejte SSID."</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Zadejte SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpečení"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Síla signálu"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Stav"</string>
@@ -927,7 +928,7 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"K dispozici (pouze pro čtení)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Celková paměť"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Výpočet…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikace (data aplikací a multimediální obsah)"</string>
+    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikace (data apl. a multimediální obsah)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Média"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Stahování"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Fotografie, videa"</string>
@@ -1021,10 +1022,10 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Obnovení továrních dat"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vymaže všechna data v tabletu"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vymaže všechna data v telefonu"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, mimo jiné následují:\n\n"<li>"váš účet Google,"</li>\n<li>"nastavení a data systému a aplikací,"</li>\n<li>"stažené aplikace."</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, mimo jiné i následující:\n\n"<li>"váš účet Google,"</li>\n<li>"nastavení a data systému a aplikací,"</li>\n<li>"stažené aplikace."</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, mimo jiné následují:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, mimo jiné i následující:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálně jste přihlášeni k těmto účtům:\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotky"</li>\n<li>"Další uživatelské údaje"</li></string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotky"</li>\n<li>"další uživatelské údaje"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"úložiště USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"kartu SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Smazat úložiště USB"</string>
@@ -1060,27 +1061,27 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavení hlasové schránky, přesměrování a čekání hovorů a ID volajícího"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering pomocí USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Přenosný hotspot"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering přes Bluetooth"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Sdílené připojení přes Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering a přenosný hotspot"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Sdílené připojení a přenosný hotspot"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"Sdílené datové připojení prostřednictvím portu USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"Sdílené připojení přes USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Připojeno přes USB. Zaškrtněte prstem políčko pro vytvoření tetheringu."</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Sdíleno"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"Nelze sdílet datové připojení, pokud se používá úložiště USB"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Připojení USB není k dispozici"</string>
     <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Chcete-li úložiště USB zapnout, připojte jej"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Chyba sdílení datového připojení prostřednictvím USB"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering přes Bluetooth"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Sdílené připojení přes Bluetooth"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Internetové připojení tabletu je sdíleno."</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Internetové připojení tohoto telefonu je sdíleno."</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Internetové připojení tohoto telefonu je sdíleno"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Internetové připojení tabletu je sdíleno s 1 zařízením."</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Internetové připojení telefonu je sdíleno s 1 zařízením."</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Internet. připojení tabletu je sdíleno. Poč. zařízení: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Internet. připojení telefonu je sdíleno. Poč. zařízení: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="1790242032929221788">"Sdílení připojení k internetu tohoto zařízení <xliff:g id="DEVICE_NAME">%1$d</xliff:g>"</string>
     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Internetové připojení tabletu není sdíleno."</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Internetové připojení tohoto telefonu není sdíleno."</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Internetové připojení tohoto telefonu není sdíleno"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Není sdíleno"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"Maximální počet zařízení pro tethering: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"U zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude ukončeno sdílené připojení."</string>
@@ -1091,7 +1092,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Chcete změnit aplikaci SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Chcete pro zprávy SMS používat aplikaci <xliff:g id="NEW_APP">%1$s</xliff:g> místo aplikace <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Chcete pro zprávy SMS používat aplikaci <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
-    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Změnit asistenta připojení Wi-Fi?"</string>
+    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Změnit nastavení Google Wi-Fi Assistant?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Chcete spravovat síťová připojení pomocí aplikace <xliff:g id="NEW_APP">%1$s</xliff:g> namísto aplikace <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"Chcete spravovat síťová připojení pomocí aplikace <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operátor SIM karty není znám"</string>
@@ -1099,7 +1100,7 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vložte SIM kartu a restartujte zařízení."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Připojte se prosím k internetu."</string>
     <string name="location_title" msgid="1029961368397484576">"Moje poloha"</string>
-    <string name="location_mode_title" msgid="3982009713118421689">"Režim"</string>
+    <string name="location_mode_title" msgid="3982009713118421689">"Režim určování polohy"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Vysoká přesnost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Úspora baterie"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Pouze zařízení"</string>
@@ -1136,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Autorská práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Smluvní podmínky"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licence open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Při načítání licencí došlo k chybě."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Načítání..."</string>
@@ -1454,7 +1459,7 @@
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Zvýší úroveň protokolování Wi‑Fi zobrazenou v SSID a RSSI při výběru sítě Wi‑Fi."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Pokud je tato možnost zapnuta, bude síť Wi-Fi agresivnější při předávání datového připojení mobilní síti při slabém signálu Wi-Fi."</string>
     <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Povolí nebo zakáže vyhledávání roamingu Wi-Fi na základě množství datového provozu na rozhraní."</string>
-    <string name="select_logd_size_title" msgid="7433137108348553508">"Velikosti vyrovnávacích pamětí protokolovacího nástroje"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Velikosti vyrovn. pamětí protokol. nástroje"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Vyberte velikosti protokolovacího nástroje na vyrovnávací paměť protokolů"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Povolit simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povolit simulované polohy"</string>
@@ -1499,7 +1504,7 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Služby"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Displej"</string>
-    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Popisky"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Titulky"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesta pro přiblížení obrazovky"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Je-li tato funkce zapnutá, můžete zobrazení přibližovat a oddalovat tak, že třikrát klepnete na obrazovku.\n\nPři přiblížení můžete provádět tyto činnosti:\n"<ul><li>"Posunutí: táhněte po obrazovce minimálně dvěma prsty."</li>\n<li>"Změna úrovně přiblížení: alespoň dva prsty stáhněte k sobě, nebo roztáhněte od sebe."</li></ul>\n\n"Také je možné dočasně zvětšit oblast pod prstem. Stačí na ni třikrát klepnout a podržet ji. V takto zvětšeném náhledu můžete přetáhnutím prstu prohlížet libovolné části obrazovky. Do předchozího zobrazení se vrátíte zdvihnutím prstu.\n\nPoznámka: Zvětšení trojitým klepnutím funguje ve všech částech obrazovky s výjimkou klávesnice a navigační lišty."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Zkratka usnadnění"</string>
@@ -1534,7 +1539,7 @@
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standardní možnosti"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"Jazyk"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"Velikost textu"</string>
-    <string name="captioning_preset" msgid="8939737196538429044">"Styl popisku"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Styl titulků"</string>
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"Vlastní možnosti"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"Barva pozadí"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"Neprůhlednost pozadí"</string>
@@ -1545,7 +1550,7 @@
     <string name="captioning_edge_color" msgid="3670094753735263238">"Barva okraje"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"Typ okraje"</string>
     <string name="captioning_typeface" msgid="1826169240566563259">"Rodina písem"</string>
-    <string name="captioning_preview_text" msgid="4067935959797375065">"Popisek bude vypadat takto"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Titulky budou vypadat takto"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"Výchozí"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Výchozí"</string>
@@ -1613,10 +1618,10 @@
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Provoz na baterii: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> od odpojení"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Nabíjení"</string>
-    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Obrazovka zapnutá"</string>
-    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aktivní"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Zapnutý displej"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"Zapnutá GPS"</string>
     <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
-    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Probudit"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktivní režim"</string>
     <string name="battery_stats_phone_signal_label" msgid="3537569115723850618">"Signál mobilní sítě"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
@@ -1668,7 +1673,7 @@
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Využití baterie v pohotovostním režimu tabletu"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Využití baterie v pohotovostním režimu telefonu"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Využití baterie jednotkou GSM"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"V oblastech bez pokrytí přepněte do režimu V letadle"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"V oblastech bez pokrytí přepněte do režimu Letadlo"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"Využití baterie svítilnou"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Využití baterie displejem a podsvícením"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Snižte jas displeje nebo interval jeho vypínání"</string>
@@ -1679,7 +1684,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Zkuste se připojit k jinému zařízení Bluetooth"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"Využití baterie aplikací"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Ukončete aplikaci nebo ji odinstalujte"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Vyberte režim úspory baterie"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Vyberte režim spořiče baterie"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"V aplikaci mohou být k dispozici nastavení ke snížení spotřeby"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterie spotřebovaná uživatelem"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"Různé využití energie"</string>
@@ -1695,7 +1700,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"Spořič baterie"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Zapnout automaticky"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nikdy"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"pokud zbývá %1$d%% baterie"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"pokud zbývá %1$d %% baterie"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiky procesů"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Podrobné statistiky běžících procesů"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Využití paměti"</string>
@@ -1814,7 +1819,7 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Odstranit všechny certifikáty"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Důvěryhodná pověření"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobrazit důvěryhodné certifikáty CA"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Pokročilé"</string>
+    <string name="advanced_security_title" msgid="2434776238010578865">"Rozšířené nastavení"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Typ úložiště"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardwarové"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Pouze software"</string>
@@ -1835,12 +1840,11 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Před použitím úložiště pověření musíte nastavit kód PIN nebo heslo zámku obrazovky."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Přístup k datům o používání"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Povolit přístup?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Pokud povolíte přístup, tato aplikace uvidí informace o ostatních aplikacích v zařízení, například jak často je používáte."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tísňové vyzvánění"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavit chování při tísňovém volání"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"Zálohování a obnovení dat"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"Zálohování a obnovení dat"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Záloha a obnova dat"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Záloha a obnova dat"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Zálohování a obnovení"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobní údaje"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohování mých dat"</string>
@@ -1985,7 +1989,7 @@
     <string name="pointer_location" msgid="6084434787496938001">"Umístění ukazatele"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"Zobrazit překryvnou vrstvu s aktuálními daty o dotycích"</string>
     <string name="show_touches" msgid="1356420386500834339">"Zobrazit dotyky"</string>
-    <string name="show_touches_summary" msgid="6684407913145150041">"Zobrazit vizuální zpětnou vazbu pro doteky"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Zobrazit vizuální zpětnou vazbu pro dotyky"</string>
     <string name="show_screen_updates" msgid="5470814345876056420">"Zobrazit obnovení obsahu"</string>
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Rozblikat obsah okna při aktualizaci"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Zobrazit obnovení s GPU"</string>
@@ -2023,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Omezení procesů na pozadí"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Zobrazit všechny ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Dialog „Aplikace neodpovídá“ pro aplikace na pozadí"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"K této operaci prosím použijte aplikaci Nastavení Google."</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Snížit využití sítě technologií WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Snižte využití sítě zprostředkováním připojení WebView prostřednictvím serverů Google na kompresi dat."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Přenesená data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Využití dat aplikací"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Účtování dat operátora se může lišit od účtování pro vaše zařízení."</string>
@@ -2209,7 +2211,7 @@
     <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"Přidat uživatele, když je zařízení uzamčeno"</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_self_title" msgid="8432050170899479556">"Chcete se smazat?"</string>
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"Odstranit uživatele?"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"Odstranit tento profil?"</string>
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"Odstranit prac. profil?"</string>
@@ -2228,7 +2230,7 @@
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Odstranit"</string>
     <string name="user_enable_calling" msgid="8310589470979488255">"Povolit telefonní hovory"</string>
     <string name="user_enable_calling_sms" msgid="794823380737672333">"Povolit telefonní hovory a SMS"</string>
-    <string name="user_remove_user" msgid="6490483480937295389">"Odebrat uživatele"</string>
+    <string name="user_remove_user" msgid="6490483480937295389">"Odstranit uživatele"</string>
     <string name="user_enable_calling_confirm_title" msgid="440218975766968124">"Povolit telefonní hovory?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"S tímto uživatelem bude sdílena historie hovorů."</string>
     <string name="user_enable_calling_sms_confirm_title" msgid="188164598768941316">"Povolit telefonní hovory a SMS?"</string>
@@ -2271,7 +2273,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Správce hovorů"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Nouzová vysílání"</string>
+    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Výstražné zprávy o výjimečné situaci"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Síťoví operátoři"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Názvy přístupových bodů"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Vylepšený režim 4G LTE"</string>
@@ -2311,7 +2313,7 @@
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Vždy používat pro hovory"</string>
     <string name="sim_select_card" msgid="211285163525563293">"Vyberte SIM kartu"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM karta <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
-    <string name="sim_slot_empty" msgid="8964505511911854688">"SIM karta je prázdná"</string>
+    <string name="sim_slot_empty" msgid="8964505511911854688">"Prázdná SIM"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Název SIM karty"</string>
     <string name="sim_editor_title" msgid="6364331907415443358">"SIM karta"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operátor"</string>
@@ -2450,9 +2452,9 @@
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonní hovory"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Zprávy"</string>
     <string name="zen_mode_from" msgid="1777739391289980762">"Od"</string>
-    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Kdokoli"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Kohokoli"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Pouze kontakty"</string>
-    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Pouze kontakty s hvězdičkou"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Kontakty s hvězdičkou"</string>
     <string name="zen_mode_alarm_info" msgid="5061362593677527505">"Budíky a další osobní připomenutí jsou vždy prioritní."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automaticky zapnout"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikdy"</string>
@@ -2471,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Je-li toto nastavení zapnuto, můžete zařízení uvést do stavu, kdy zůstane zobrazena aktuální obrazovka.\n\nPostup připnutí obrazovky:\n\n1. Zapněte příslušné nastavení.\n\n2. Spusťte aplikaci.\n\n3. Klepněte na tlačítko Poslední.\n\n4. Klepněte na ikonu špendlíku."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Pracovní profil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentální)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Při otočení zařízení"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Otočit obsah obrazovky"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Zachovat orientaci na výšku"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Zachovat orientaci na šířku"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Zachovat aktuální orientaci"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 805bd82..badcea3 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Anmodning om parring"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Tryk for at parre med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Vis modtagne filer"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Valg af Bluetooth-enhed"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Anmodning om Bluetooth-tilladelse"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"En app ønsker at aktivere Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"En app ønsker at gøre din tablet synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Der blev ikke foretaget nogen nulstilling, fordi tjenesten Systemoprydning ikke er tilgængelig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vil du nulstille?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Gendannelse af fabriksindstillinger er ikke tilgængeligt for denne bruger"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Sletter…"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Vent et øjeblik…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Slet USB-lager"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Slet SD-kort"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Sletter alle data i USB-lager"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Ophavsret"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Vilkår og betingelser"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open source-licenser"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Der er problemer med at indlæse licenserne."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Indlæser..."</string>
@@ -1164,7 +1167,7 @@
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Prøv igen:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Tegn et oplåsningsmønster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tryk på Menu for at få hjælp."</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Slip fingeren, når du er færdig"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Slip, når du er færdig"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Forbind mindst <xliff:g id="NUMBER">%d</xliff:g> punkter. Prøv igen."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Mønstret blev registreret"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Tegn mønstret igen for at bekræfte"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du skal angive en pinkode eller adgangskode til skærmlåsen, før du kan bruge lageret for loginoplysninger."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps med brugsadgang"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Vil du give adgang?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Hvis du giver adgang, kan denne app se generelle oplysninger om de apps, som du har på enheden, som f.eks. hvor ofte du bruger dem."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Angiv adfærd ved nødopkald"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sikkerhedskopiering/nulstilling"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Grænse for baggrundsprocesser"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Vis alle \"Appen svarer ikke\""</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Vis \"Appen svarer ikke\" for baggrundsapps"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Brug appen Google Settings til denne handling"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Reducer netværksbrug for WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Reducer netværksforbruget ved at oprette proxyforbindelser for WebView via Googles komprimeringsservere"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataforbrug"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dataforbrug for appen"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilselskabets dataopgørelse kan variere afhængigt af din enhed."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Når denne indstilling er slået til, kan du aktivere en tilstand på enheden, der fastholder visningen af det aktuelle skærmbillede.\n\nSådan fastgør du et skærmbillede:\n\n1. Slå denne indstilling til.\n\n2. Åbn en app.\n\n3. Tryk på knappen Seneste apps.\n\n4. Tryk på tegnestiften."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Arbejdsprofil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentel)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Når enheden roteres"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Roter skærmindholdet"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Behold portrætvisning"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Behold landskabsvisning"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Behold den aktuelle orientering"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 85dece0..1ca3710 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pairing-Anfrage"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Für Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> berühren"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Empfangene Dateien anzeigen"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth-Geräteauswahl"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-Berechtigungsanfrage"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Eine App versucht, Bluetooth zu aktivieren."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Eine App versucht, Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen."</string>
@@ -1041,10 +1042,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Die Zurücksetzung konnte nicht durchgeführt werden, weil der Dienst zur Systembereinigung nicht verfügbar ist."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Zurücksetzen?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Das Zurücksetzen auf Werkseinstellungen ist für diesen Nutzer nicht verfügbar."</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Löschen"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Bitte warten..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-Speicher löschen"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD-Karte löschen"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Löscht alles im USB-Speicher."</string>
@@ -1139,6 +1138,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Urheberrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Lizenz"</string>
     <string name="terms_title" msgid="7697580845616764642">"Nutzungsbedingungen"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-Source-Lizenzen"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Beim Laden der Lizenzen ist ein Problem aufgetreten."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Wird geladen..."</string>
@@ -1840,8 +1843,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Zur Verwendung des Anmeldeinformationsspeichers müssen Sie eine PIN oder ein Passwort für die Displaysperre festlegen."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps mit Nutzungsdatenzugriff"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Zugriff gewähren?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Wenn Sie dieser App Zugriff gewähren, kann sie allgemeine Informationen zu Ihren Apps abrufen, z. B. wie oft Sie die Apps verwenden."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Notfallsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Verhalten bei einem Notruf festlegen"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sichern &amp; zurücksetzen"</string>
@@ -2028,11 +2030,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Hintergrundprozesslimit"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Alle ANRS anzeigen"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Dialogfeld \"App antwortet nicht\" für Hintergrund-Apps anzeigen"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Bitte verwenden Sie die App \"Google Einstellungen\" für diesen Vorgang."</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView-Netzwerknutzung reduzieren"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Netzwerknutzung durch Proxyvorgang von WebView-Verbindungen über Google-Komprimierungsserver reduzieren"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datenverbrauch"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Datennutzung durch Apps"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ihr Mobilfunkanbieter berechnet die Datennutzung eventuell anders als das Gerät."</string>
@@ -2476,4 +2476,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Wenn diese Einstellung aktiviert ist, können Sie festlegen, dass der aktuelle Bildschirm dauerhaft auf dem Gerät angezeigt wird.\n\nSo heften Sie einen Bildschirm an:\n\n1. Aktivieren Sie diese Einstellung.\n\n2. Öffnen Sie eine App.\n\n3. Tippen Sie auf \"Neueste\".\n\n4. Tippen Sie auf das Stecknadelsymbol."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Arbeitsprofil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentell)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Bei Drehung des Geräts"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Bildschirminhalte drehen"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Hochformat beibehalten"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Querformat beibehalten"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Aktuelle Ausrichtung beibehalten"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7b7d1bf..a6e070b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Αίτημα σύζευξης"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Αγγίξτε για σύζευξη με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Εμφάνιση ληφθέντων αρχείων"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Επιλογέας συσκευής Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Αίτημα άδειας Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Μια εφαρμογή θέλει να κάνει ορατό το tablet σας σε άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Δεν πραγματοποιήθηκε επαναφορά επειδή η υπηρεσία Εκκαθάρισης συστήματος δεν είναι διαθέσιμη."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Να γίνει επαναφορά;"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Η επαναφορά των εργοστασιακών ρυθμίσεων δεν είναι διαθέσιμη γι\' αυτόν το χρήστη"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Διαγραφή"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Περιμένετε…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Διαγρ. αποθ. χώρου USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Διαγραφή κάρτας SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Διαγρ. δεδομ. αποθ. χώρου USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Πνευματικά δικαιώματα"</string>
     <string name="license_title" msgid="1990487604356037871">"Άδεια"</string>
     <string name="terms_title" msgid="7697580845616764642">"Όροι και προϋποθέσεις"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Άδειες λογισμ.ανοικτ.κώδ."</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Παρουσιάστηκε ένα πρόβλημα κατά τη φόρτωση των αδειών."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Φόρτωση..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Πρέπε να ορίσετε έναν κωδικό PIN ή έναν κωδικό κλειδώματος οθόνης πριν χρησιμοποιήσετε τον χώρο αποθήκευσης διαπιστευτηρίων."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Εφαρμογές με πρόσβαση χρήσης"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Να επιτρέπεται η πρόσβαση;"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Εάν επιτρέψετε την πρόσβαση, αυτή η εφαρμογή μπορεί να βλέπει γενικές πληροφορίες σχετικά με τις εφαρμογές στη συσκευή σας, όπως τη συχνότητα χρήσης τους."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Τόνος επείγουσας ανάγκης"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ορισμός συμπεριφοράς κατά την πραγματοποίηση κλήσης επείγουσας ανάγκης"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Αντίγραφα ασφαλείας και επαναφορά"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Όριο διεργασ. παρασκηνίου"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Εμφάνιση όλων των ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Εμφ.του παραθ. \"Η εφαρμ.δεν αποκρ.\" για εφ.παρασκ."</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Χρησιμοποιήστε την εφαρμογή Ρυθμίσεις Google γι\' αυτήν τη λειτουργία"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Μείωση χρ. δικτ. WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Περιορίστε τη χρήση δικτύου με τη μεσολάβηση των συνδέσεων WebView μέσω των διακομιστών συμπίεσης της Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Χρήση δεδομένων"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Χρήση δεδομένων εφαρμογής"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ο υπολογισμός δεδομένων εταιρείας κινητής τηλεφωνίας μπορεί να διαφέρει από τη συσκευή σας."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Όταν είναι ενεργοποιημένη αυτή η ρύθμιση, μπορείτε να ενεργοποιήσετε μια κατάσταση στη συσκευή που διατηρεί την προβολή της τρέχουσας οθόνης.\n\nΓια να καρφιτσώσετε μια οθόνη:\n\n1. Ενεργοποιήστε τη ρύθμιση.\n\n2. Ανοίξτε μια εφαρμογή.\n\n3. Αγγίξτε το κουμπί \"Πρόσφατα \".\n\n4. Αγγίξτε το εικονίδιο με την καρφίτσα."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Προφίλ εργασίας"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Πειραματικό)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Κατά την περιστροφή της συσκευής"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Περιστρέψτε το περιεχόμενο της οθόνης"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Διατήρηση κατακόρυφης προβολής"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Διατήρηση οριζόντιας προβολής"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Διατήρηση τρέχοντος προσανατολισμού"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index bf71ee0..86e0a55 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -152,7 +152,7 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pairing request"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Touch to pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Show files received"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth device chooser"</string>
+    <string name="device_picker" msgid="4978696506172252813">"Choose Bluetooth device"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth permission request"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"An app wants to turn on Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"An app wants to make your tablet visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
@@ -1136,6 +1136,8 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terms and conditions"</string>
+    <string name="wallpaper_attributions" msgid="3645880512943433928">"Wallpapers"</string>
+    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satellite imagery providers:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-source licences"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"There is a problem loading the licences."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Loading…"</string>
@@ -2468,4 +2470,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"When this setting is turned on, you can put the device in a state that keeps the current screen in view.\n\nTo pin a screen:\n\n1. Turn this setting on.\n\n2. Open an app.\n\n3. Touch the Recents button.\n\n4. Touch the pin icon."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Work profile"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"When device is rotated"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotate the contents of the screen"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Stay in portrait view"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Stay in landscape view"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Stay in current orientation"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index bf71ee0..86e0a55 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -152,7 +152,7 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pairing request"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Touch to pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Show files received"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth device chooser"</string>
+    <string name="device_picker" msgid="4978696506172252813">"Choose Bluetooth device"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth permission request"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"An app wants to turn on Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"An app wants to make your tablet visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
@@ -1136,6 +1136,8 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terms and conditions"</string>
+    <string name="wallpaper_attributions" msgid="3645880512943433928">"Wallpapers"</string>
+    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satellite imagery providers:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-source licences"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"There is a problem loading the licences."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Loading…"</string>
@@ -2468,4 +2470,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"When this setting is turned on, you can put the device in a state that keeps the current screen in view.\n\nTo pin a screen:\n\n1. Turn this setting on.\n\n2. Open an app.\n\n3. Touch the Recents button.\n\n4. Touch the pin icon."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Work profile"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"When device is rotated"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotate the contents of the screen"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Stay in portrait view"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Stay in landscape view"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Stay in current orientation"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 53bc034..41941db 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Vinculando solicitud"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toca para realizar una sincronización con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar los archivos recibidos"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Selector de dispositivos Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <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 tablet para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"No se realizó ningún restablecimiento debido a que el servicio \"Eliminar sistema\" no está disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"¿Restablecer?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"El restablecimiento de la configuración de fábrica no está disponible para este usuario."</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Borrando"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Espera un momento…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Eliminar almacenamiento USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Eliminar tarjeta SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Borra todos los datos del almacenamiento USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencias de código abierto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Hay un problema para cargar las licencias."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Debes establecer un PIN o contraseña de la pantalla de bloqueo antes de usar el almacenamiento de credenciales."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Acceso a datos de uso"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"¿Deseas permitir el acceso?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Si permites el acceso, esta aplicación podrá ver información general sobre las aplicaciones del dispositivo, como la frecuencia con la que las utilizas."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer el comportamiento cuando se establece una llamada de emergencia"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Copia de seguridad y restablecer"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Límite de procesos en segundo plano"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Errores sin respuesta"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostrar diálogo cuando las aplic. en 2do plano no responden"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Utiliza la aplicación Configuración de Google para esta operación."</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Reducir uso red WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Reducir el uso de red transmitiendo las conexiones de WebView con un proxy a través de los servidores de compresión de Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso datos de aplicación"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"La forma en que el proveedor contabiliza los datos puede variar en tu dispositivo."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Cuando esta configuración está activada, puedes colocar el dispositivo en un estado que mantenga visible la pantalla actual.\n\nPara fijar una pantalla:\n\n1. Activa esta configuración.\n\n2. Abre una aplicación.\n\n3. Presiona el botón Recientes.\n\n4. Presiona el ícono de marcador."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabajo"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Al girar el dispositivo"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Girar el contenido de la pantalla"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Mantener vista vertical"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Mantener vista horizontal"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Mantener orientación actual"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 4ee8b8a..1b79538 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -203,7 +203,7 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ninguno"</item>
     <item msgid="8673874894887358090">"Manual"</item>
-    <item msgid="168893341855953140">"Ajustes automáticos proxy"</item>
+    <item msgid="168893341855953140">"Proxy autoconfigurado"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Ninguno"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8b6a5c8..695219c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitud de vinculación"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toca para vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar archivos recibidos"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Selector de dispositivo Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Una aplicación quiere activar el Bluetooth."</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>
@@ -169,7 +170,7 @@
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activando Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desactivando Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conexión automática"</string>
-    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitud para establecer conexión de Bluetooth"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitud para conectar con Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Toca para conectarte a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"¿Quieres conectarte a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Solicitud de acceso a agenda teléfonica"</string>
@@ -505,7 +506,7 @@
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositivos sincronizados"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Dispositivos disponibles"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"No hay dispositivos disponibles"</string>
-    <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Establecer conexión"</string>
+    <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Conectar"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Desconectar"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Vincular y conectar"</string>
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Desincronizar"</string>
@@ -514,7 +515,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Ajustes avanzados"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Ajustes avanzados de Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Cuando se activa el Bluetooth, tu dispositivo puede comunicarse con otros dispositivos Bluetooh cercanos."</string>
-    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Establecer conexión con…"</string>
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar con…"</string>
     <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio multimedia"</string>
     <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio del teléfono"</string>
     <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferencia de archivos"</string>
@@ -531,8 +532,8 @@
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará y no compartirá la conexión a Internet de este tablet."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará y no compartirá la conexión a Internet de este teléfono."</string>
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Dispositivo Bluetooth sincronizado"</string>
-    <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Establecer conexión"</string>
-    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Establecer conexión con dispositivo Bluetooth"</string>
+    <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Conectar"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Conectar con dispositivo Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Usar para"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Cambiar nombre"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permitir transferencias entrantes"</string>
@@ -640,7 +641,7 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ajustes avanzados"</string>
-    <string name="wifi_menu_connect" msgid="4996220309848349408">"Establecer conexión con red"</string>
+    <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar con red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Borrar red"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar red"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Escribir en etiqueta NFC"</string>
@@ -699,15 +700,15 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"¿Iniciar sesión para conectar?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> requiere que inicies sesión para conectarte."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
-    <string name="wifi_connect" msgid="1076622875777072845">"Establecer conexión"</string>
+    <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Error al conectar a la red"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Borrar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Error al eliminar la red"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Error al guardar la red"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
-    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Omitir de todas formas"</string>
-    <string name="wifi_dont_skip" msgid="7350341524881124808">"No omitir"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Saltar de todas formas"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"No saltar"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ADVERTENCIA: Si omites la conexión Wi‑Fi, el tablet solo utilizará datos móviles para realizar descargas y actualizaciones iniciales. Conéctate al Wi‑Fi para evitar posibles cargos de datos."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ADVERTENCIA: Si omites la conexión Wi‑Fi, el dispositivo solo utilizará datos móviles para realizar descargas y actualizaciones iniciales. Conéctate al Wi‑Fi para evitar posibles cargos de datos."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ADVERTENCIA: Si omites la conexión Wi‑Fi, el teléfono solo utilizará datos móviles para realizar descargas y actualizaciones iniciales. Conéctate al Wi‑Fi para evitar posibles cargos de datos."</string>
@@ -750,7 +751,7 @@
     <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Si desconectas el dispositivo, finalizará la conexión con <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Si desconectas el dispositivo, finalizará la conexión con <xliff:g id="PEER_NAME">%1$s</xliff:g> y con otros dispositivos de <xliff:g id="PEER_COUNT">%2$s</xliff:g>."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"¿Quieres cancelar la invitación?"</string>
-    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"¿Quieres cancelar la invitación para establecer conexión con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"¿Quieres cancelar la invitación para conectar con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"¿Borrar este grupo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona Wi-Fi portátil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Zona Wi‑Fi"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"No se ha reiniciado el sistema porque el servicio Borrado del sistema no está disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"¿Restablecer?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Este usuario no puede restablecer los datos de fábrica"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Borrando"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Espera..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Borrar almacenamiento USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Borrar tarjeta SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Borra los datos de USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencias de código abierto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Se ha producido un problema al intentar cargar las licencias."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando…"</string>
@@ -1172,7 +1175,7 @@
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirmar"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Crear un patrón nuevo"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Repetir"</string>
-    <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"Seguir"</string>
+    <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"Continuar"</string>
     <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>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Para poder usar el almacenamiento de credenciales, debes establecer una contraseña o un PIN para la pantalla de bloqueo."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplicaciones con acceso de uso"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"¿Permitir acceso?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Si permites el acceso, esta aplicación podrá ver información general sobre las aplicaciones del dispositivo, como la frecuencia con la que las utilizas."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer comportamiento al realizar una llamada de emergencia"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Copia de seguridad"</string>
@@ -1899,7 +1901,7 @@
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancelar"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Buscando redes…"</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Toca en una red para conectarte a ella"</string>
-    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Establecer conexión con red existente"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Conectar con red existente"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectar con red no segura"</string>
     <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Introducir configuración de red"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Establecer conexión con red nueva"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Límitar procesos en segundo plano"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Errores sin respuesta"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Informar de que una aplicación en segundo plano no responde"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Utiliza la aplicación Ajustes de Google para esta operación"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Reducir uso red WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Reducir uso de red utilizando un proxy para las conexiones de WebView a través de los servidores de compresión de Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso datos de aplicación"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"El uso de datos determinado por el operador puede ser diferente al recuento del dispositivo."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Si esta opción está activada, puedes hacer que el dispositivo mantenga visible la pantalla actual.\n\nPara activar una pantalla, sigue estos pasos:\n\n1. Activa esta opción.\n\n2. Abre una aplicación.\n\n3. Toca el botón Recientes.\n\n4. Toca el icono de marcador."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabajo"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Al girar el dispositivo"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Girar el contenido de la pantalla"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Mantener vista vertical"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Mantener vista horizontal"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Mantener orientación actual"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 3d9910d..5968bcc 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Sidumistaotlus"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Puudutage seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühildamiseks."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Näita vastuvõetud faile"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth-seadme valija"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetoothi loa taotlus"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Rakendus soovib Bluetoothi sisse lülitada."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Rakendus soovib muuta <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks teie tahvelarvuti teistele Bluetoothi seadmetele nähtavaks."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Lähtestust ei tehtud, sest süsteemi kustutamise teenus pole saadaval."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Kas lähtestada?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Tehaseseadetele lähtestamine pole selle kasutaja puhul saadaval"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Kustutamine"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Oodake ..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Kustuta USB-mäluseade"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Kustuta SD-kaart"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Kustutab USB-lt kõik andmed"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Autoriõigus"</string>
     <string name="license_title" msgid="1990487604356037871">"Litsents"</string>
     <string name="terms_title" msgid="7697580845616764642">"Nõuded ja tingimused"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Avatud lähtekoodiga litsentsid"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Litsentside laadimisega on probleem."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Laadimine ..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Enne mandaatide salvestusruumi kasutamist peate määrama lukustusekraani PIN-koodi või parooli."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Kasutusjuurdepääsuga rakend."</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Kas lubada juurdepääs?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Kui lubate juurdepääsu, saab see rakendus vaadata üldteavet teie seadmes olevate rakenduste kohta (näiteks seda, kui sageli neid kasutate)."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Hädaabitoon"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Määra käitumine hädaabikõne korral"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Varundamine ja lähtestamine"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Taustaprotsesside piir"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Näita kõiki ANR-e"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Kuva taustarakendustele dial. Rakendus ei reageeri"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Kasutage selle toimingu jaoks rakendust GoogleSettings"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView\' võrgukas. vähendus"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Vähendage võrgukasutust, kasutades WebView-ühenduste jaoks puhverserverina Google\'i tihendusservereid"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Andmekasutus"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Rakenduse andmekasutus"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operaatori andmemahuarvestus võib erineda seadme omast"</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Kui see seade on sisse lülitatud, saate panna seadme olekusse, mis hoiab praeguse ekraanikuva nähtaval.\n\nEkraanikuva kinnitamine.\n\n1. Lülitage seade sisse.\n\n2. Avage rakendus.\n\n3. Puudutage nuppu Hiljutised.\n\n4. Puudutage kinnitamisikooni."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Tööprofiil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Katseline)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kui seade on pööratud"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ekraanikuva sisu pööramine"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Vertikaalkuva säilitamine"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Horisontaalkuva säilitamine"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Praeguse suuna säilitamine"</string>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index a13fb09..9953403 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Bikotetzeko eskaera"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin parekatzeko, ukitu hau."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Erakutsi jasotako fitxategiak"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth gailuen hautatzailea"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth baimen-eskaera"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikazio batek Bluetootha aktibatu nahi du."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikazio batek tableta ikusgai ezarri nahi du beste Bluetooth gailuetarako <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Ez da berrezartzerik gauzatu, sistema garbitzeko zerbitzua ez dagoelako erabilgarri."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Berrezarri?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Erabiltzaileak ez du jatorrizko datuak berrezartzeko baimenik"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Ezabatzen"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Itxaron, mesedez…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ezabatu USB memoria"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Ezabatu SD txartela"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB memoriako datu guztiak ezabatzen ditu"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyrighta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lizentzia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Zehaztapenak eta baldintzak"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Kode irekiko lizentziak"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Arazo bat izan da lizentziak kargatzean."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Kargatzen…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kredentzialen biltegia erabili aurretik, pantaila blokeatzeko PIN kodea edo pasahitza ezarri behar duzu."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Erabilera-datuak atzi ditzaketenak"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Sarbidea eman nahi diozu?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Sarbidea baimenduz gero, gailuko aplikazioei buruzko informazio orokorra ikus dezake aplikazioak, esate baterako, zer maiztasunarekin erabiltzen diren."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Larrialdi-tonua"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ezarri larrialdi-deiak egitean izan beharreko portaera."</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Babeskopiak eta berrezartzea"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Atzeko planoko prozesuen muga"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Erakutsi ANR guztiak"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"\"Erantzunik ez\" mezua atz. planoko aplikazioetarako"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Eragiketa honetarako, erabili Google Ezarpenak aplikazioa"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Murriztu WebView erabilera"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Murriztu sarearen erabilera WebView konexioak Google konprimatze-zerbitzarien proxy bidez bideratuta"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datu-erabilera"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Aplikazioaren datu-erabilera"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Beharbada operadoreak zenbatzen duen datu kopurua eta gailuak zenbatzen duena ez datoz bat."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Ezarpen hau aktibatuta dagoenean, uneko pantaila etengabe erakuts dezan konfigura dezakezu gailua.\n\nPantaila ainguratzeko:\n\n1. Aktibatu ezarpen hau.\n\n2. Ireki aplikazio bat.\n\n3. Ukitu \"Azkenak\" botoia.\n\n4. Ukitu ainguraren ikonoa."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Laneko profila"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Esperimentala)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Gailua biratzen denean"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Aldatu pantailaren orientazioa"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Jarraitu modu bertikalean"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Jarraitu modu horizontalean"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ez aldatu pantailaren orientazioa"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 611125c..4a73921 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"درخواست جفت سازی"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"لمس کردن برای جفت کردن با <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"نمایش فایل‌های دریافتی"</string>
-    <string name="device_picker" msgid="8398232791303186677">"انتخاب‌گر دستگاه بلوتوث"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"درخواست مجوز بلوتوث"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"برنامه‌ای می‌خواهد بلوتوث را روشن کند."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"برنامه‌ای می‌خواهد رایانه لوحی شما را برای سایر دستگاه‌های بلوتوث به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"هیچ بازنشانی انجام نشد زیرا سرویس پاکسازی سیستم در دسترس نیست."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"بازنشانی؟"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"بازنشانی به تنظیمات کارخانه برای این کاربر در دسترس نیست"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"در حال پاک کردن"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"لطفاً صبر کنید..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"‏پاک کردن حافظهٔ USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"‏پاک کردن کارت SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"‏حذف همه داده‌های موجود در حافظهٔ USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"حق نسخه‌برداری"</string>
     <string name="license_title" msgid="1990487604356037871">"مجوز"</string>
     <string name="terms_title" msgid="7697580845616764642">"شرایط و مقررات"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"مجوزهای منبع باز"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"مشکلی در بارگیری مجوزها وجود دارد."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"در حال بارگیری…"</string>
@@ -1602,8 +1605,8 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> مانده"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> مانده تا شارژ کامل"</string>
-    <string name="power_discharging" msgid="6023874912674684056">"<xliff:g id="LEVEL">%1$d</xliff:g>٪٪"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>٪٪ - تقریباً <xliff:g id="TIME">%2$s</xliff:g> مانده است"</string>
+    <string name="power_discharging" msgid="6023874912674684056">"<xliff:g id="LEVEL">%1$d</xliff:g>%%"</string>
+    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - تقریباً <xliff:g id="TIME">%2$s</xliff:g> مانده است"</string>
     <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>٪٪ - ‏<xliff:g id="STATE">%2$s</xliff:g>"</string>
     <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل"</string>
     <string name="power_charging_duration_ac" msgid="3611179931297824699">"‏<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل از طریق AC"</string>
@@ -2470,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"هنگامی که این تنظیم روشن است، می‌توانید دستگاه را در حالتی قرار دهید که صفحه کنونی را در معرض نمایش قرار می‌دهد.\n\nبرای پین کردن یک صفحه نمایش:\n\n۱. این تنظیم را روشن کنید.\n\n۲. برنامه‌ای را باز کنید.\n\n۳. دکمه «موارد اخیر» را لمس کنید.\n\n۴. نماد پین را لمس کنید."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"نمایه کاری"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(تجربی)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"وقتی دستگاه چرخانده می‌شود"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"چرخاندن محتوای صفحه"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ماندن در نمای چهره"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ماندن در نمای منظره"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ماندن در جهت کنونی"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 48e2fe2..37f66e1 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Laiteparinmuodostuspyyntö"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Muodosta laitepari laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koskettamalla."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Näytä vastaanotetut tiedostot"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth-laitevalitsin"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-yhteyspyyntö"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Sovellus haluaa ottaa Bluetoothin käyttöön."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Sovellus haluaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
@@ -470,12 +471,9 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Hallinnoi yhteyksiä, aseta laitteen nimi ja tunnistettavuus"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth-laiteparipyyntö"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (4954085254142996877) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing_key_msg (333005542843637754) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (6813273136442138444) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="4954085254142996877">"Laite"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="333005542843637754">"Yhdistämiskoodi"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"Kirjoita yhdistämiskoodi ja paina sitten Return tai Enter"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN-koodi sisältää kirjaimia tai symboleja"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Yleensä 0000 tai 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Saatat joutua syöttämään tämän PIN-koodin myös toiseen laitteeseen."</string>
@@ -1043,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Palauttamista ei suoritettu, koska System Clear -palvelu ei ole käytettävissä."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Palautetaanko?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Tämä käyttäjä ei voi palauttaa tehdasasetuksia"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Tyhjennetään"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Odota…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Tyhjennä USB-tila"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Tyhjennä SD-kortti"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Poistaa USB-tilan tiedot"</string>
@@ -1141,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Tekijänoikeudet"</string>
     <string name="license_title" msgid="1990487604356037871">"Käyttölupa"</string>
     <string name="terms_title" msgid="7697580845616764642">"Käyttöehdot"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Avoimen lähdekoodin käyttöluvat"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Käyttölupien lataamisessa esiintyi ongelma."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Ladataan…"</string>
@@ -1856,8 +1856,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Ruudunlukituksen PIN-koodi tai salasana on asetettava ennen kuin käyttöoikeustietojen tallennustilaa voi käyttää."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Sovellukset, joilla on lupa"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Myönnetäänkö käyttöoikeus?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Jos myönnät käyttöoikeuden, tämä sovellus voi tarkastella yleisiä tietoja laitteesi sovelluksista, esimerkiksi kuinka usein käytät niitä."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Hätäpuhelun ääni"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Aseta toiminta hätäpuhelun tapauksessa"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Varmuuskopioi ja palauta"</string>
@@ -2044,11 +2043,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Taustapros. enintään"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Näytä kaikki ANR:t"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Näytä Sovellus ei vastaa -ikkuna taustasovell."</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Käytä GoogleSettings-sovellusta tähän toimintoon"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Väh. WebView\'n verkon käytt."</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Vähennä verkon käyttöä välittämällä WebView-yhteydet Googlen pakkauspalvelinten kautta"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Tietojen käyttö"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Sovelluksen tiedonsiirto"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operaattorin mittaustulos saattaa erota laitteesi mittaamasta."</string>
@@ -2492,4 +2489,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Kun asetus on käytössä, voit asettaa laitteen tilaan, joka pitää nykyisen näytön näkyvissä.\n\nNäytön kiinnittäminen:\n\n1. Ota asetus käyttöön.\n\n2. Avaa sovellus.\n\n3. Kosketa Viimeaikaiset-painiketta.\n\n4. Kosketa kiinnityskuvaketta."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Työprofiili"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Kokeellinen)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kun laite käännetään"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Kierrä näytön sisältö"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Säilytä pystynäkymä"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Säilytä vaakanäkymä"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Säilytä nykyinen suunta"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 95faafc..43041ac 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Demande d\'association"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Appuyez pour associer l\'appareil à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afficher les fichiers reçus"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Sélecteur d\'appareil Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Demande d\'autorisation Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Une application requiert l\'activation du Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre tablette pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Les données n\'ont pas été réinitialisées, car le service de nettoyage du système n\'est pas disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Réinitialiser?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Le rétablissement de la configuration d\'usine n\'est pas possible pour cet utilisateur"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Suppression en cours..."</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Veuillez patienter..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Effacer la mémoire de stockage USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Effacer la carte SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Efface toutes les données de la mémoire de stockage USB."</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Droits d\'auteur"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Conditions d\'utilisation"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licences Open Source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Un problème est survenu lors du chargement des licences."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Chargement en cours..."</string>
@@ -1839,8 +1842,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Avant d\'utiliser le stockage d\'identifiants, vous devez définir un NIP ou un mot de passe pour le verrouillage d\'écran."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Applis avec accès données util."</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Autoriser l\'accès?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Si vous autorisez cette application à accéder aux données d\'utilisation, elle pourra obtenir des renseignements généraux sur les applications de votre appareil, tels que la fréquence à laquelle vous les utilisez."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sonnerie d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sauvegarder et réinitialiser"</string>
@@ -2027,11 +2029,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limite processus arr.-plan"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Afficher tous les messages «L\'application ne répond pas»"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Afficher « L\'application ne répond plus » pour applis en arrière-plan"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Veuillez utiliser l\'application Paramètres Google pour effectuer cette opération"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Réduire util. rés. WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Réduire l\'utilisation du réseau en utilisant le mandatement des connexions WebView par l\'intermédiaire des serveurs de compression de Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilisation des données"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Util. données aplication"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"La manière dont le fournisseur de services effectue les calcul des données peut être différente."</string>
@@ -2477,4 +2477,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Lorsque ce paramètre est activé, vous pouvez modifier l\'état de l\'appareil afin que l\'écran actuel reste visible.\n\nPour épingler un écran, procédez comme suit :\n\n1. Activez ce paramètre.\n\n2. Ouvrez une application.\n\n3. Touchez le bouton « Récents ».\n\n4. Touchez l\'icône représentant une punaise."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profil professionnel"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Expérimentale)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Lorsque l\'utilisateur pivote l\'appareil"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Pivoter le contenu de l\'écran"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Rester en mode portrait"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Rester en mode paysage"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Garder l\'orientation actuelle"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 79b5db9..283599f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Demande d\'association"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Appuyez pour associer l\'appareil à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afficher les fichiers reçus"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Sélecteur d\'appareil Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Demande d\'autorisation Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Une application requiert l\'activation du Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre tablette pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Les données n\'ont pas été réinitialisées, car le service de nettoyage du système n\'est pas disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Réinitialiser ?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Le rétablissement de la configuration d\'usine n\'est pas disponible pour cet utilisateur."</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Suppression en cours"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Veuillez patienter..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Effacer la mémoire USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Effacer la carte SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Efface les données de la mémoire USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Droits d\'auteur"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Conditions d\'utilisation"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licences open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Un problème est survenu lors du chargement des licences."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Chargement..."</string>
@@ -1839,8 +1842,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Avant d\'utiliser le stockage d\'identifiants, vous devez définir un code PIN ou un mot de passe pour le verrouillage d\'écran."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Applis avec accès données util."</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Autoriser l\'accès ?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Si vous autorisez cette application à accéder aux données d\'utilisation, elle pourra obtenir des informations générales sur les applications de votre appareil, telles que la fréquence à laquelle vous les utilisez."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sonnerie d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sauvegarder et réinitialiser"</string>
@@ -2027,11 +2029,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limite processus arr.-plan"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Afficher tous les messages ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Afficher \"L\'application ne répond plus\" pour applis en arrière-plan"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Veuillez utiliser l\'application Paramètres Google pour effectuer cette opération."</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Réduire util. rés. WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Réduire l\'utilisation du réseau en faisant passer les connexions WebView par des serveurs de compression Google (expérimental)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Consommation des données"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Conso données application"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Le suivi de la consommation effectué par votre opérateur peut différer de celui de votre appareil."</string>
@@ -2477,4 +2477,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Lorsque ce paramètre est activé, vous pouvez modifier l\'état de l\'appareil afin que l\'écran actuel reste visible.\n\nPour épingler un écran, procédez comme suit :\n\n1. Activez ce paramètre.\n\n2. Ouvrez une application.\n\n3. Appuyez sur le bouton Récents.\n\n4. Appuyez sur l\'icône représentant une punaise."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profil professionnel"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Expérimental)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Lorsque l\'utilisateur fait pivoter l\'appareil"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Faire pivoter le contenu affiché à l\'écran"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Rester en mode portrait"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Rester en mode paysage"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Conserver l\'orientation actuelle"</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index fe76d56..1d27b43 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitude de sincronización"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Tocar para sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar ficheiros recibidos"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Selector de dispositivos Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitude de permiso de Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Unha aplicación quere activar o Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Unha aplicación quere que o teu tablet estea visible para outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Non se levou a cabo ningún restablecemento debido a que o servizo de borrado do sistema non está dispoñible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Restablecer?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"O restablecemento de fábrica non está dispoñible para este usuario"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Borrando"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Agarda..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Borrar almacenamento USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Borrar tarxeta SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Borra datos almacenamento USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e condicións"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenzas de código aberto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Hai un problema para cargar as licenzas."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Tes que definir un PIN ou un contrasinal de pantalla de bloqueo para poder utilizar o almacenamento de credenciais."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplicacións con acceso de uso"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Queres permitir o acceso?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Se permites o acceso, esta aplicación pode visualizar información xeral acerca das aplicacións do teu dispositivo, como a frecuencia coa que as utilizas."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de emerxencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Define o comportamento cando se realiza unha chamada de emerxencia"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Copia de seguranza e restablecemento"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Límite proceso 2º plano"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Mostrar todos os ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Informa que aplicación segundo plano non responde"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Utiliza a aplicación GoogleSettings para esta operación"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Reducir o uso de WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Reduce o uso da rede a través das conexións de proxy de WebView  nos servidores de compresión de Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso datos da aplicación"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"A contabilidade dos datos do operador pode ser diferente á do teu dispositivo."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Ao activar esta configuración, podes poñer o dispositivo nun estado que manteña a pantalla actual á vista.\n\nPara activar unha pantalla:\n\n1. Activa esta configuración.\n\n2. Abre unha aplicación.\n\n3. Toca o botón Recentes.\n\n4. Toca a icona de marcador."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Perfil do traballo"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Ao xirar o dispositivo"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Xirar o contido da pantalla"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Permanecer na vista vertical"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Permanecer na vista horizontal"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Permanecer na orientación actual"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 8a71284..5f07f37 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"युग्‍मन अनुरोध"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> के साथ युग्‍मित करने के लिए स्पर्श करें."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"प्राप्त फ़ाइलें दिखाएं"</string>
-    <string name="device_picker" msgid="8398232791303186677">"ब्लूटूथ उपकरण चयनकर्ता"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"ब्लूटूथ अनूमति अनुरोध"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"एक ऐप्स  ब्लूटूथ को चालू करना चाहता है."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"एक ऐप्स  आपके टेबलेट को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य ब्लूटूथ उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
@@ -651,7 +652,7 @@
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्‍वचालित सेटअप (WPS)"</string>
     <string name="wifi_required_info_text" msgid="7442238187557620087">"सेटअप पूर्ण करने के लिए, आपके टेबलेट को वाई-फ़ाई की एक्सेस चाहिए. सेटअप के बाद, आप सेल्युलर डेटा और वाई-फ़ाई के बीच स्विच कर सकते हैं."</string>
-    <string name="wifi_show_advanced" msgid="3409422789616520979">"उन्नत विकल्प"</string>
+    <string name="wifi_show_advanced" msgid="3409422789616520979">"अतिरिक्त सेटिंग"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"वाई-फ़ाई  सुरक्षित सेटअप"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ हो रहा है…"</string>
     <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"अपने राउटर पर वाई-फ़ाई  सुरक्षित सेटअप बटन दबाएं. इसे \"WPS\" कहा जा सकता है या इसमें यह चिन्ह हो सकता है:"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"सिस्‍टम साफ़ करें सेवा उपलब्‍ध न होने के कारण कोई रीसेट निष्‍पादित नहीं किया गया था."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करें?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"इस उपयोगकर्ता के लिए फ़ैक्टरी रीसेट उपलब्ध नहीं है"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"मिटाया जा रहा है"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"कृपया प्रतीक्षा करें..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB संग्रहण मिटाएं"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD कार्ड मिटाएं"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB संग्रहण का सभी डेटा मिटाएं"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"लाइसेंस"</string>
     <string name="terms_title" msgid="7697580845616764642">"नियम और शर्तें"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ओपन सोर्स लाइसेंस"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"लाइसेंस लोड करने में एक समस्‍या है."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"लोड हो रहा है..."</string>
@@ -1351,8 +1354,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"सिस्‍टम सेवा बंद करें?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"यदि आप यह सेवा रोकते हैं, तो हो सकता है कि आपके टेबलेट की कुछ सुविधाएं ठीक से कार्य करना बंद कर दें जब तक कि आप उसे बंद करके फिर से चालू  न कर लें."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"यदि आप यह सेवा रोकते हैं, तो हो सकता है कि आपके फ़ोन की कुछ सुविधाएं ठीक से कार्य करना बंद कर दें जब तक कि आप उसे बंद करके फिर से चालू  न कर लें."</string>
-    <string name="language_settings" msgid="5292716747264442359">"भाषा और अक्षर"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"भाषा और अक्षर"</string>
+    <string name="language_settings" msgid="5292716747264442359">"भाषा और कीबोर्ड"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"भाषा और कीबोर्ड"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"भाषा सेटिंग"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"कीबोर्ड और इनपुट पद्धति"</string>
     <string name="phone_language" msgid="8870144109924299673">"भाषा"</string>
@@ -1837,12 +1840,11 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"क्रेडेंशियल संग्रहण का उपयोग करने से पहले, आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
     <string name="usage_access_title" msgid="332333405495457839">"उपयोग की एक्सेस वाले ऐप्स"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"एक्सेस की अनुमति दें?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"यदि आप एक्सेस की अनुमति देते हैं, तो यह ऐप्स आपके उपकरण पर ऐप्स के बारे में सामान्य जानकारी देख सकता है, जैसे आप उनका उपयोग कितनी बार करते हैं."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"आपातकालीन टोन"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"आपातकालीन कॉल करने के दौरान व्‍यवहार सेट करें"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"सुरक्षित करें और रीसेट करें"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"सुरक्षित करें और रीसेट करें"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"सुरक्षित और रीसेट करें"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"सुरक्षित और रीसेट करें"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"सुरक्षित करें और पुनर्स्‍थापित करें"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"निजी डेटा"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"मेरे डेटा को सुरक्षित करें"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"पृष्ठभूमि प्रक्रिया सीमा"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"सभी ANR दिखाएं"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"पृष्ठभूमि ऐप्स हेतु ऐप्स प्रतिसाद नहीं दे रहा डॉयलॉग दिखाएं"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"कृपया इस कार्य के लिए GoogleSettings ऐप्स का उपयोग करें"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView नेटवर्क उपयोग घटाएं"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Google संपीडन सर्वर के द्वारा WebView कनेक्शन को प्रॉक्सी करके नेटवर्क उपयोग घटाएं"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"डेटा उपयोग"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ऐप्स डेटा उपयोग"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"वाहक की डेटा गणना आपके उपकरण से भिन्न हो सकती है."</string>
@@ -2127,7 +2127,7 @@
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec उपयोगकर्ता प्रमाणपत्र"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA प्रमाणपत्र"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec सर्वर प्रमाणपत्र"</string>
-    <string name="vpn_show_options" msgid="7182688955890457003">"उन्नत विकल्प दिखाएं"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"अतिरिक्त सेटिंग दिखाएं"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS खोज डोमेन"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS सर्वर (उदा. 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"अग्रेषण मार्ग (उदा. 10.0.0.0/8)"</string>
@@ -2208,7 +2208,7 @@
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"केवल फ़ोन का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
     <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_add_on_lockscreen_menu" msgid="3025132738715222247">"उपकरण लॉक होने पर उपयोगकर्ताओं को जोड़ें"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"फोन लॉक रहते उपयोगकर्ता जोड़ें"</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>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"जब यह सेटिंग चालू होती है, तो आप उपकरण को ऐसी स्थिति में रख सकते हैं जिससे वर्तमान स्क्रीन दिखाई देती रहती है.\n\nस्क्रीन को पिन करने के लिए:\n\n1. इस सेटिंग को चालू करें.\n\n2. कोई ऐप्स खोलें.\n\n3. हाल ही के बटन स्पर्श करें.\n\n4. पिन आइकन स्पर्श करें."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"कार्य प्रोफ़ाइल"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"उपकरण घुमाए जाने पर"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"स्क्रीन की सामग्री को घुमाएं"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"पोर्ट्रेट दृश्य में बने रहें"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"भू-दृश्य में बने रहें"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिविन्यास में बने रहें"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8b0fb1b..d10e245 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahtjev za uparivanje"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Dodirnite za uparivanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Prikaži primljene datoteke"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Birač Bluetooth uređaja"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zatraženo je Bluetooth dopuštenje"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikacija želi uključiti Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikacija želi vaše tabletno računalo učiniti vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Nije došlo do poništavanja jer nije dostupna usluga brisanja sustava."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Poništiti?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Vraćanje na tvorničko stanje nije dostupno za ovog korisnika"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Brisanje"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Pričekajte..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Izbriši USB memoriju"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Izbriši karticu SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Briše sve podatke USB memorije"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Autorska prava"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Uvjeti i odredbe"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Otvori licence izvora"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Došlo je do problema s učitavanjem licenci."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Učitavanje…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Trebate postaviti PIN ili zaporku za zaključavanje zaslona prije nego što ćete moći upotrebljavati pohranu vjerodajnica."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apl. s pristupom pod. o upot."</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Želite li dopustiti pristup?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Ako dopustite pristup, ta aplikacija može vidjeti općenite informacije o aplikacijama na vašem uređaju, na primjer, koliko ih često upotrebljavate."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton hitnog poziva"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Postavite način ponašanja za hitan poziv"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Stvori sigurnosnu kopiju i poništi"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Ograničenje pozadinskog procesa"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Prikaži sve ANR-ove"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Prikaz dijaloga o pozad. aplik. koja ne odgovara"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Za tu radnju upotrijebite aplikaciju Google postavke"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Smanjenje upotr. mreže za WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Smanjenje upotrebe mreže otvaranjem WebView veza proxyjem putem Googleovih poslužitelja za komprimiranje"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Potrošnja podataka"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Upotreba podataka za apl."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Kada je ta postavka uključena, možete postaviti uređaj tako da prikaz ostane na trenutačnom zaslonu.\n\nDa biste prikvačili zaslon:\n\n1. Uključite tu postavku.\n\n2. Otvorite aplikaciju.\n\n3. Dodirnite gumb Najnoviji.\n\n4. Dodirnite ikonu pribadače."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Radni profil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentalno)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kada se uređaj rotira"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotiraj sadržaj zaslona"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Ostani u okomitom prikazu"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Ostani u vodoravnom prikazu"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ostani u trenutačnom usmjerenju"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 957143b..55a5c32 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Párosítási kérelem"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Érintse meg a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközzel való párosításhoz."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Beérkező fájlok megjelenítése"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth-eszközválasztó"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth engedélykérés"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Egy alkalmazás be akarja kapcsolni a Bluetooth funkciót."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Egy alkalmazás láthatóvá akarja tenni a táblagépet más Bluetooth-eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Nem történt visszaállítás, mert a Rendszertisztítás szolgáltatás nem érhető el."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Visszaállítás?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"A gyári beállítások visszaállítása nem hajtható végre ennél a felhasználónál"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Törlés"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Kérjük, várjon…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-tár törlése"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD-kártya törlése"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Törli az USB-tár adatait"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Szerzői jog"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenc"</string>
     <string name="terms_title" msgid="7697580845616764642">"Általános Szerződési Feltételek"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Nyílt forráskódú licencek"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Gond van a licencek betöltésével."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Betöltés…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Be kell állítania a zárolási képernyő PIN kódját vagy jelszavát, mielőtt használhatná az azonosítótárolót."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Alkalmazások hozzáféréssel"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Megadja a hozzáférést?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Ha engedélyezi, az alkalmazás általános adatokat tekinthet meg az eszközön lévő alkalmazásokkal kapcsolatban, például azok használatának gyakoriságát."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Segélyhívás hangja"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Viselkedés beállítása segélyhívás kezdeményezésekor"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Biztonsági mentés és visszaállítás"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Háttérfolyamat-korlátozás"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Összes ANR mutatása"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Az Alkalmazás nem válaszol ablak megjelenítése"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Ehhez a művelethez használja a GoogleSettings alkalmazást"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView-használat csökkentése"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Csökkentse a hálózati forgalmat úgy, hogy átvezeti a WebView-kapcsolatokat a Google tömörítőszerverein"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Adathasználat"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Alkalmazás adathasználata"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"A szolgáltató adatszámlálási módja eltérhet az eszközétől."</string>
@@ -2475,4 +2475,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Ha ez a beállítás be van kapcsolva, olyan állapotba helyezheti az eszközt, amely fenntartja az aktuális képernyő megjelenítését.\n\nKépernyő rögzítéséhez:\n\n1. Kapcsolja be ezt a beállítást.\n\n2. Nyisson meg egy alkalmazást.\n\n3. Érintse meg a Legutóbbiak gombot.\n\n4. Érintse meg a gombostű ikont."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Munkaprofil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Kísérleti)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Az eszköz forgatásakor"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Az oldal tartalmának forgatása"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Álló nézet megtartása"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Fekvő nézet megtartása"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Jelenlegi tájolás megtartása"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index e98f5d4..50f24a6 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Զուգավորման հայց"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Հպեք` <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի հետ զուգավորվելու համար:"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ցուցադրել ստացված ֆայլերը"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth սարք ընտրող"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-ի թույլտվության հայց"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Հավելվածը ցանկանում է միացնել Bluetooth-ը:"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Հավելվածը ցանկանում է ձեր գրասալիկը տեսանելի դարձնել այլ Bluetooth սարքերի համար <xliff:g id="TIMEOUT">%1$d</xliff:g> վայրկյանում:"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Վերականգնում տեղի չի ունեցել, քանի որ համակարգի մաքրիչ ծառայությունը հասանելի չէ:"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Վերակայե՞լ:"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Այս օգտվողը չի կարող վերակայել սարքը և վերականգնել գործարանային կարգավորումները"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Ջնջում"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Խնդրում ենք սպասել..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ջնջել USB կրիչը"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Ջնջել SD քարտը"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Ջնջում է USB կրիչի տվյալները"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Հեղինակային իրավունք"</string>
     <string name="license_title" msgid="1990487604356037871">"Արտոնագիր"</string>
     <string name="terms_title" msgid="7697580845616764642">"Կանոններն ու պայմանները"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Բաց աղբյուրով լիցենզիաներ"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Խնդիր կա լիցենզիաները բեռնելիս:"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Բեռնում...."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Վկայականների պահոցն օգտագործելու համար անհրաժեշտ է, որ էկրանը կողպող PIN կամ գաղտնաբառ կիրառեք:"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Թույլատրված հավելվածներ"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Թույլատրե՞լ մուտքը:"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Եթե թույլատրեք մատչումը, այս հավելվածը կարող է տեսնել ձեր սարքի հավելվածների մասին ընդհանուր տեղեկություններ, օրինակ՝ թե որքան հաճախ եք օգտագործել դրանք:"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Արտակարգ իրավիճակ ահազանգող ազդանշան"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Սահմանել վարքը արտակարգ իրավիճակների զանգի դեպքում"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Պահուստավորում և վերակայում"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Հետնաշերտի գործընթացի սահմանաչափ"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Ցույց տալ բոլոր ANR-երը"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Ցուցադրել այն ծրագիրը, որը չի արձագանքում երկխոսությունը հետնաշերտի ծրագրերի համար"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Խնդրում ենք օգտագործել GoogleSettings հավելվածը՝ այս գործողությունը կատարելու համար"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Կրճատել WebView-ի հոսքը"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Կրճատեք ցանցի օգտագործումը՝ օգտագործելով WebView կապերի պրոքսի-սերվերը՝ Google-ի սեղմման սերվերների միջոցով"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Տվյալների օգտագործում"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ծրագրի տվյալների օգտագործումը"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Օպերատորի հաշվարկները տվյալների կապի օգտագործման վերաբերյալ կարող են տարբերվել սարքի հաշվարկներց:"</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Երբ այս կայանքը միացված է, դուք կարող եք սարքի էկրանը պահել տեսադաշտում:\n\nԷկրանն ամրակցելու համար՝\n\n1. Միացրեք այս կայանքը:\n\n2. Բացեք որևէ ծրագիր:\n\n3. Հպեք Վերջինները կոճակին:\n\n4. Հպեք ամրակցման պատկերակին:"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Աշխատանքային պրոֆիլ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Փորձնական)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Երբ սարքը պտտվում է"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Պտտեցնել էկրանի բովանդակությունը"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Մնալ դիմանկարային դիրքով"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Մնալ լանդշաֆտային դիրքով"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Մնալ ընթացիկ դիրքով"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 42c9652..aeca9b9 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Permintaan penyandingan"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Sentuh untuk menyandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tampilkan file yang diterima"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Pemilih perangkat bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan izin bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Sebuah aplikasi ingin mengaktifkan Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Sebuah aplikasi ingin menampilkan tablet Anda pada perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Penyetelan ulang tidak dilakukan karena layanan System Clear tidak tersedia."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Setel ulang?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Fitur kembalikan ke setelan pabrik tidak tersedia untuk pengguna ini"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Menghapus"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Harap tunggu..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Hapus penyimpanan USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Hapus kartu SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Hapus semua data di penyimpanan USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Persyaratan dan ketentuan"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Lisensi sumber terbuka"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Ada masalah saat memuat lisensi."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Memuat…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Anda perlu menyetel PIN atau sandi pengunci layar sebelum dapat menggunakan penyimpanan kredensial."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplikasi dengan akses penggunaan"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Izinkan akses?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Jika Anda mengizinkan akses, aplikasi ini dapat melihat informasi umum tentang aplikasi di perangkat Anda, seperti seberapa sering Anda menggunakannya."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nada darurat"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Setel perilaku ketika panggilan darurat dilakukan"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Buat cadangan &amp; setel ulang"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Batas proses latar blkg"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Tampilkan semua ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Tmplkn dialog Apl Tidak Merespons utk apl ltr blkg"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Gunakan aplikasi Setelan Google untuk operasi ini"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Kurangi Pemakaian WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Kurangi penggunaan jaringan dengan menggunakan proxy pada sambungan WebView melalui server kompresi Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Penggunaan data aplikasi"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Penghitungan data operator mungkin berbeda dengan perangkat Anda."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Saat setelan ini diaktifkan, Anda dapat menempatkan perangkat dalam keadaan yang terus menampilkan layar yang sedang ditayangkan.\n\nUntuk menyematkan layar:\n\n1. Aktifkan setelan ini.\n\n2. Buka aplikasi.\n\n3. Sentuh tombol Terkini.\n\n4. Sentuh ikon sematkan."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profil kerja"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimental)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Saat perangkat diputar"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Putar konten layar"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Tetap dalam tampilan potret"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Tetap dalam tampilan lanskap"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Tetap dalam orientasi saat ini"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index f7955db..5f6f0ce 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Beiðni um pörun"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Snertu til að hefja pörun við <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Sýna mótteknar skrár"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Val Bluetooth-tækis"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-heimildarbeiðni"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Forrit óskar eftir að kveikja á Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Forrit óskar eftir að gera spjaldtölvuna þína sýnilega öðrum Bluetooth-tækjum í <xliff:g id="TIMEOUT">%1$d</xliff:g> sekúndur."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Endurstilling var ekki framkvæmd vegna þess að kerfishreinsunarþjónustan er ekki tiltæk."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Endurstilla?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Núllstilling er ekki í boði fyrir þennan notanda"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Þurrkað út"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Augnablik..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Hreinsa út af USB-geymslu"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Hreinsa út af SD-korti"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Eyðir öllum gögnum USB-geymslu"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Höfundarréttur"</string>
     <string name="license_title" msgid="1990487604356037871">"Leyfi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Skilmálar"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Leyfi opins kóða"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Vandamál kom upp við að hlaða leyfin."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Hleður…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Þú þarft að velja PIN-númer eða aðgangsorð lásskjás til að geta notað skilríkjageymsluna."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Forrit með notkunaraðgang"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Leyfa aðgang?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Ef þú veitir aðgang getur þetta forrit skoðað almennar upplýsingar um forritin þín, svo sem hversu oft þú notar þau."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Neyðartónn"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Velja hvað gerist þegar neyðarsímtal er hringt"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Afritun og endurstilling"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Takmörkun á bakgrunnsvinnslum"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Öll forrit sem svara ekki"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Sýna „Forrit svarar ekki“ fyrir bakgrunnsforrit"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Notaðu stillingaforrit Google fyrir þessa aðgerð"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Draga úr netnotkun WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Draga úr netnotkun með því að senda veftengingar gegnum þjöppunarþjóna Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Gagnanotkun"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Gagnanotkun forrits"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Gagnaútreikningur símafyrirtækisins kann að sýna aðra niðurstöðu en tækið þitt."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Þegar kveikt er á þessari stillingu geturðu sett tækið í stöðu þar sem núverandi skjár helst sýnilegur.\n\nTil að festa skjá:\n\n1. Kveiktu á þessari stillingu.\n\n2. Opnaðu forrit.\n\n3. Snertu hnappinn fyrir nýlegt.\n\n4. Snertu festingartáknið."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Vinnusnið"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Tilraun)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Þegar tækinu er snúið"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Snúa innihaldi skjásins"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Halda skammsniði"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Halda langsniði"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Halda þessari stefnu"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 81b4b55..d8fe560 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Richiesta accoppiamento"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Tocca per l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra file ricevuti"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Selettore dispositivo Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Richiesta autorizzazione Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Un\'app chiede di attivare il Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Un\'app chiede di rendere il tablet visualizzabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
@@ -644,7 +645,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Elimina rete"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica rete"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Scrivi su tag NFC"</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_off" msgid="8056223875951079463">"Per conoscere le reti disponibili, attiva il Wi‑Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Ricerca reti Wi‑Fi in corso…"</string>
     <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="1484433183857764750">"Aggiungi un\'altra rete"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Nessun ripristino eseguito perché il servizio System Clear non è disponibile."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Reimpostare?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Il ripristino dati di fabbrica non è consentito per questo utente"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Cancellazione in corso"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Attendere prego…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Cancella archivio USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Cancella scheda SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Cancella i dati nell\'arch. USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termini e condizioni"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenze open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Errore durante il caricamento delle licenze."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Caricamento..."</string>
@@ -1149,7 +1152,7 @@
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Scegli la tua sequenza"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Scegli il tuo PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Conferma la tua password"</string>
-    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Conferma il tuo modello"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Conferma la tua sequenza"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Conferma il tuo PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Password non corrispondente"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"I PIN non corrispondono"</string>
@@ -1632,7 +1635,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Regola consumo alimentazione"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pacchetti inclusi"</string>
     <string name="power_screen" msgid="3023346080675904613">"Schermo"</string>
-    <string name="power_flashlight" msgid="7794409781003567614">"Flashlight"</string>
+    <string name="power_flashlight" msgid="7794409781003567614">"Torcia"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Cellulare in standby"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Devi impostare un PIN o una password di blocco dello schermo per poter utilizzare l\'archivio credenziali."</string>
     <string name="usage_access_title" msgid="332333405495457839">"App con accesso utilizzo"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Consentire l\'accesso?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Se consenti l\'accesso, questa app può visualizzare informazioni generali sulle app installate sul tuo dispositivo, ad esempio la frequenza con cui le utilizzi."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono chiamate emergenza"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Imposta il comportamento in caso di chiamata di emergenza"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Backup e ripristino"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limite processi background"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Mostra tutti errori ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostra finestra ANR per applicazioni in background"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Utilizza l\'app Impostazioni Google per questa operazione"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Riduci uso rete WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Riduci l\'utilizzo della rete eseguendo il proxy delle connessioni WebView tramite i server di compressione di Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizzo dati"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dati sull\'utilizzo dell\'app"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"I dati contabili dell\'operatore potrebbero differire da quelli del dispositivo."</string>
@@ -2197,7 +2197,7 @@
     <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="2108112641783146007">"Aggiungere un nuovo utente?"</string>
-    <string name="user_add_user_message_long" msgid="718192651887726259">"Puoi condividere questo dispositivo con altri creando utenti aggiuntivi, ciascuno con un proprio spazio personalizzabile con le app, gli sfondi e le altre opzioni che preferisce. Questi utenti possono anche modificare impostazioni (ad es., Wi‑Fi) che influenzano tutti gli altri.\n\nIl nuovo utente, una volta aggiunto, deve impostare il proprio spazio.\n\nQualsiasi utente può aggiornare le app per tutti gli altri."</string>
+    <string name="user_add_user_message_long" msgid="718192651887726259">"Puoi condividere il dispositivo con altre persone creando altri utenti. Ogni utente ha un proprio spazio personalizzabile con le app, gli sfondi e le altre opzioni che preferisce. Gli utenti possono anche regolare le impostazioni che riguardano tutti, come il Wi‑Fi.\n\nIl nuovo utente, una volta aggiunto, dovrà seguire una procedura di configurazione.\n\nQualsiasi utente può aggiornare le app per tutti gli altri utenti."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Il nuovo utente, una volta aggiunto, deve impostare il proprio spazio.\n\nQualsiasi utente può aggiornare le app per tutti gli altri."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurare l\'utente ora?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Assicurati che la persona sia disponibile a prendere il dispositivo e configurare il suo spazio"</string>
@@ -2378,7 +2378,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Il tag NFC non è modificabile. Utilizza un tag diverso."</string>
     <string name="default_sound" msgid="8821684447333687810">"Suono predefinito"</string>
     <string name="notification_settings" msgid="8791730980212496561">"Audio e notifiche"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Volume app. multimediali"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Volume contenuti multimediali"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume sveglia"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume suoneria"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume notifiche"</string>
@@ -2467,10 +2467,15 @@
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Impostazioni di notifica"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Invia feedback sul dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Inserisci PIN amministratore"</string>
-    <string name="switch_on_text" msgid="1124106706920572386">"Attiva"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Non attiva"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"Blocco della schermata"</string>
-    <string name="screen_pinning_description" msgid="3022868253807792488">"Quando questa impostazione è attiva, puoi impostare lo stato del dispositivo in modo che venga visualizzata la schermata corrente.\n\nPer bloccare una schermata:\n\n1. Attiva questa impostazione.\n\n2. Apri un\'app.\n\n3. Tocca il pulsante Recenti.\n\n4. Tocca l\'icona di blocco."</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"Attivo"</string>
+    <string name="switch_off_text" msgid="1139356348100829659">"Non attivo"</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"Blocco su schermo"</string>
+    <string name="screen_pinning_description" msgid="3022868253807792488">"Quando questa impostazione è attiva, puoi far sì che dispositivo mantenga visualizzata la schermata corrente.\n\nPer bloccare una schermata:\n\n1. Attiva questa impostazione.\n\n2. Apri un\'app.\n\n3. Tocca il pulsante Recenti.\n\n4. Tocca l\'icona della puntina."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profilo di lavoro"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Sperimentale)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Quando il dispositivo viene ruotato"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ruota i contenuti dello schermo"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Rimani in visualizzazione verticale"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Rimani in visualizzazione orizzontale"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Rimani in orientamento corrente"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1f5cd98..26f1d79 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"בקשת התאמה"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"גע כדי ליצור התאמה עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"הצג קבצים שהתקבלו"</string>
-    <string name="device_picker" msgid="8398232791303186677">"‏בוחר מכשיר Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"‏בקשה להרשאת Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"‏אפליקציה מסוימת רוצה להפעיל את ה-Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"‏אפליקציה מסוימת רוצה להפוך את הטאבלט שלך לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"לא בוצע איפוס מכיוון שהשירות \'ניקוי מערכת\' אינו זמין."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"לאפס?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"איפוס להגדרות היצרן אינו זמין עבור המשתמש הזה"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"מוחק"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"אנא המתן..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"‏מחק אחסון USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"‏מחק כרטיס SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"‏מוחק את כל הנתונים באמצעי אחסון מסוג USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"זכויות יוצרים"</string>
     <string name="license_title" msgid="1990487604356037871">"רישיון"</string>
     <string name="terms_title" msgid="7697580845616764642">"תנאים והגבלות"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"רשיונות קוד פתוח"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"יש בעיה בטעינת הרישיון."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"טוען..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"‏עליך להגדיר PIN או סיסמה לנעילת המסך כדי שתוכל להשתמש באחסון אישורים."</string>
     <string name="usage_access_title" msgid="332333405495457839">"אפליקציות עם גישה לנתוני שימוש"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"האם לאפשר גישה?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"אם תאפשר גישה, אפליקציה זו תוכל להציג מידע כללי על האפליקציות במכשיר שלך, כמו התדירות שבה אתה משתמש באפליקציות אלה."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"צליל חירום"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"הגדר אופן פעולה בעת ביצוע שיחת חירום"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"גיבוי ואיפוס"</string>
@@ -1985,7 +1987,7 @@
     <string name="strict_mode" msgid="1938795874357830695">"מצב קפדני מופעל"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"גרום למסך להבהב כאשר אפליקציות מבצעות פעולות ארוכות בשרשור הראשי"</string>
     <string name="pointer_location" msgid="6084434787496938001">"מיקום מצביע"</string>
-    <string name="pointer_location_summary" msgid="840819275172753713">"שכבת על של המסך המציגה את נתוני המגע הנוכחיים"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"שכבת-על של המסך המציגה את נתוני המגע הנוכחיים"</string>
     <string name="show_touches" msgid="1356420386500834339">"הצג נגיעות"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"הצג משוב חזותי עבור נגיעות"</string>
     <string name="show_screen_updates" msgid="5470814345876056420">"הצג עדכונים על פני השטח"</string>
@@ -2008,7 +2010,7 @@
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"אלץ כיוון פריסה מימין לשמאל"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"אלץ כיוון פריסת מסך מימין לשמאל עבור כל השפות בכל המקומות"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"‏הצג את השימוש ב-CPU"</string>
-    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"‏שכבת על של מסך שמציגה את השימוש הנוכחי ב-CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"‏שכבת-על של מסך שמציגה את השימוש הנוכחי ב-CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"‏אלץ עיבוד ב-GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"‏אכוף שימוש ב-GPU לשרטוט דו-מימדי"</string>
     <string name="force_msaa" msgid="7920323238677284387">"‏אלץ הפעלת 4x MSAA"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"מגבלה של תהליך ברקע"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"‏הצג את כל פריטי ה-ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"הצג תיבת דו-שיח של \'אפליקציה לא מגיבה\' עבור אפליקציות שפועלות ברקע"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"‏השתמש באפליקציה GoogleSettings לביצוע פעולה זו"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"‏צמצום השימוש ברשת WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"‏הפחת את השימוש ברשת על ידי העברת חיבורי WebView באמצעות שרתי הדחיסה של Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"שימוש בנתונים"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"שימוש בנתונים באפליקציות"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"ייתכן שחישוב השימוש בנתונים אצל הספק יהיה שונה מזה שבמכשיר."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"כשההגדרה הזו פועלת, ניתן להעביר את המכשיר למצב שמשאיר את המסך הנוכחי בתצוגה.\n\nלהצמדת מסך:\n\n1. הפעל את ההגדרה הזו.\n\n2. פתח אפליקציה כלשהי.\n\n3. גע בלחצן \'אחרונות\'.\n\n4. גע בסמל ההצמדה."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"פרופיל עבודה"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ניסיוני)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"בעת סיבוב המכשיר"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"סובב את תוכן המסך"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"הישאר בתצוגה לאורך"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"הישאר בתצוגה לרוחב"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"הישאר בכיוון המסך הנוכחי"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e0eb73a..826ed3a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -154,7 +154,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ペア設定リクエスト"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"タップして<xliff:g id="DEVICE_NAME">%1$s</xliff:g>をペアに設定"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"受信済みファイルを表示"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetoothデバイスの選択"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth許可リクエスト"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"アプリがBluetoothをONにしようとしています。"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスにこのタブレットを表示しようとしています。"</string>
@@ -1042,10 +1043,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"System Clearサービスが利用できないため、リセットされませんでした。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"リセットしますか？"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"このユーザーは出荷時設定へのリセットを許可されていません"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"消去中"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"お待ちください..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USBストレージ内データを消去"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SDカード内データを消去"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USBストレージ内の全データ消去"</string>
@@ -1140,6 +1139,10 @@
     <string name="copyright_title" msgid="865906688917260647">"著作権"</string>
     <string name="license_title" msgid="1990487604356037871">"ライセンス"</string>
     <string name="terms_title" msgid="7697580845616764642">"利用規約"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"オープンソースライセンス"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ライセンスの読み込み中に問題が発生しました。"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"読み込み中..."</string>
@@ -1843,8 +1846,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"認証情報ストレージを使用するには、画面ロックのPINまたはパスワードを設定する必要があります。"</string>
     <string name="usage_access_title" msgid="332333405495457839">"使用履歴にアクセスできるアプリ"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"アクセスを許可しますか？"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"アクセスを許可すると、このアプリは使用頻度など端末上のアプリに関する一般的な情報を表示できるようになります。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急時の音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"緊急通報時の動作を設定します"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"バックアップとリセット"</string>
@@ -2031,11 +2033,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"バックグラウンドプロセスの上限"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"すべてのANRを表示"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"バックグラウンドアプリが応答しない場合に通知する"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"この操作には、Google設定アプリをご使用ください"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebViewネットワーク使用量を削減"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Google圧縮サーバーを介してWebView接続をプロキシすることにより、ネットワーク使用量を削減します"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"データ使用量"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"アプリのデータ使用"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"端末で記録されるデータ使用量と携帯通信会社のデータ使用量は異なる場合があります。"</string>
@@ -2479,4 +2479,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"この設定をONにすると、端末で現在の画面が常に表示される状態にすることができます。\n\n画面を固定するには:\n\n1. この設定をONにします。\n\n2. アプリを開きます。\n\n3. [最近]ボタンをタップします。\n\n4. 固定アイコンをタップします。"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"ワークプロフィール"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"（試験運用）"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"端末が回転したとき"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"画面のコンテンツを回転させる"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"縦向きのままにする"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"横向きのままにする"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"現在の向きを維持する"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 9b4e765..213d1f6 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"დაწყვილების თხოვნა"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"შეეხეთ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან დასაწყვილებლად."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"მიღებული ფაილების ნახვა"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth მოწყობილობის ამომრჩეველი"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-ის ჩართვის ნებართვის მოთხოვნა"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"აპლიკაციას სურს Bluetooth-ის ჩართვა."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"აპს სურს, გახადოს თქვენი ტაბლეტი ხილვადი სხვა Bluetooth მოწყობილობებისთვის <xliff:g id="TIMEOUT">%1$d</xliff:g> წამით."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"არ ჩამოყრილა, რადგან System Clear სამსახური მიუწვდომელია."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ჩამოვყაროთ პარამეტრები?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ქარხნულ პარამეტრებზე დაბრუნება ამ მომხმარებლისათვის მიუწვდომელია"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"ამოშლა"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"გთხოვთ, დაელოდოთ..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"წაშალე USB მეხსიერება"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"წაშალე SD ბარათი"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"წაშლის ყველა მონაცემს USB მეხსიერებაში"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"საავტორო უფლებები"</string>
     <string name="license_title" msgid="1990487604356037871">"ლიცენზია"</string>
     <string name="terms_title" msgid="7697580845616764642">"წესები და პირობები"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ღია კოდის ლიცენზიები"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ლიცენზიის ჩამოტვირთვასთან პრობლემაა."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ჩატვირთვა…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"ავტორიზაციის მონაცემების საცავის გამოყენებამდე, საჭიროა, რომ დააყენოთ ეკრანის დასაბლოკი PIN ან პაროლი."</string>
     <string name="usage_access_title" msgid="332333405495457839">"აპები გამოყენებაზე წვდომით"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"გსურთ წვდომის ნების დართვა?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"თუ წვდომის ნებას დართავთ, ეს აპი შეძლებს ნახოს თქვენს მოწყობილობაზე არსებული აპების შესახებ ზოგადი ინფორმაცია, მაგ. თქვენ მიერ მათი გამოყენების სიხშირე."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"საგანგებო ზარის ტონალური სიგნალი"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ქცევის დაყენება, როცა განხორციელებულია გადაუდებელი ზარი"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"აღდგენა და ჩამოყრა"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"ფონური პროცესების ლიმიტი"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"ყველა ANR-ის ჩვენება"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"შეტყობინების ჩვენება, როცა ფონური აპლიკაცია არ პასუხობს"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"ამ ოპერაციისათვის, გთხოვთ, გამოიყენოთ GoogleSettings აპი"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView ქსელის გამოყენების შემცირება"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"ქსელის გამოყენების შემცირება WebView კავშირების Google კომპრესიის სერვერებზე გატარების გზით"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"მონაცემთა გადაცემის მოხმარება"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"აპის მონაცემთა გამოყენება"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"ოპერატორის მიერ მონაცემთა აღრიცხვა შესაძლოა თქვენი მოწყობილობის აღრიცხვისგან განსხვავდებოდეს."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"როდესაც ეს პარამეტრი ჩართულია, შეგიძლიათ მოწყობილობა ისეთ მდგომარეობაში მოათავსოთ, რომ მიმდინარე ეკრანი მუდამ პოპულარული იყოს.\n\nსაჩვენებელი ვერსიის ჩასამაგრებლად:\n\n1. ჩართეთ ეს პარამეტრი.\n\n2. გახსენით აპი.\n\n3. შეეხეთ ბოლო მოქმედებების ღილაკს.\n\n4. შეეხეთ ჩამაგრების ხატულას."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"სამუშაო პროფილი"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ექსპერიმენტული)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"მოწყობილობის შეტრიალებისას"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"ქონთენთის ეკრანზე შებრუნება"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"პორტრეტის ხედზე დარჩენა"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ლანდშაფტის ხედზე დარჩენა"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ამჟამინდელ ორიენტაციაზე დარჩენა"</string>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 7eda66c..9b54b79 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Жұптау өтініші"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> жұптасу үшін оны түртіңіз."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Алынған файлдарды көрсету"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth құрылғысын таңдағыш"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth рұқсат өтініші"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Қолданба Bluetooth қызметін қосуды қалайды."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Қолданба планшетіңіздің басқа Bluetooth құрылғыларына <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд аралығында көрсетілуін қалайды."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Қайта реттеулер орындалмады, себебі Жүйе Тазалау қызметі қол жетімсіз."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Қайта реттелсін бе?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Зауыттық параметрлерді қалпына келтіру бұл пайдаланушы үшін қол жетімді емес"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Өшірілуде"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Күте тұрыңыз…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB жадын өшіру"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD картасын өшіру"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB жадындағы барлық деректерді өшіреді"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Авторлық құқықтар"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
     <string name="terms_title" msgid="7697580845616764642">"Шарттары"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Бастапқы лицензияларды ашу"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Лицензияларды жүктеу барысында мәселе орын алды."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Жүктелуде..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Растау деректері қорын қолдануға дейін экранды бекіту PIN коды немесе кілтсөзін тағайындау қажет."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Пайдалануға қатынасы бар қолданбалар"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Қатынасуға рұқсат беру керек пе?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Егер қатынасуға рұқсат етсеңіз, бұл қолданба құрылғыдағы қолданбалар туралы жалпы ақпаратты көре аласыз, мысалы, оларды қаншалықты жиі пайдаланатыныңыз туралы ақпаратты."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Төтенше әуен"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Төтенше қоңырау шалу әрекетін орнату"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Сақтық көшірме және қайта реттеу"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Артқы шеп үрдісінің шектеуі"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Барлық ANR (қолданба жауап бермеді) хабарларын көрсетіңіз"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Артқы шептегі қолданбалар үшін Қолданба жауап бермейді жақтауын көрсету"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Бұл әрекет үшін GoogleSettings қолданбасын пайдаланыңыз"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView желіні пайдалануын азайту"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"WebView байланыстарын Google сығу серверлерінен прокси-сервер ретінде өткізіп, желіні пайдалануды азайту"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Дерекқор қолдану"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Қолданба деректерін пайдалану"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Оператордың деректер есебі құрылғыңыздан басқаша болуы мүмкін."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Бұл параметр қосулы болса, құрылғыны ағымдағы экранды көріністе сақтайтын күйге қоюға болады.\n\nЭкранды бекіту үшін:\n\n1. Осы параметрді қосыңыз.\n\n2. Қолданбаны ашыңыз.\n\n3. «Жақындағылар» түймесін түртіңіз.\n\n4. Бекіту белгішесін түртіңіз."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Жұмыс профилі"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Эксперименттік)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Құрылғы бұрылғанда"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Экран мазмұнын бұру"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Портреттік көріністе қалу"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Пейзаждық көріністе қалу"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ағымдағы бағдарда қалу"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index e0a208d..73b524b 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"សំណើ​ផ្គូផ្គង"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"ប៉ះ​ដើម្បី​ផ្គូផ្គង​ជា​មួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"បង្ហាញ​ឯកសារ​បាន​ទទួល"</string>
-    <string name="device_picker" msgid="8398232791303186677">"កម្មវិធី​ជ្រើស​ឧបករណ៍​ប៊្លូធូស"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"សំណើ​សិទ្ធិ​ប៊្លូធូស"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"កម្មវិធី​ចង់​បើក​ប៊្លូធូស។"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"កម្មវិធី​ចង់​ឲ្យ​​ធ្វើ​ឲ្យ​ឧបករណ៍​ប៊្លូធូស​ផ្សេង​មើល​ឃើញ​​កុំព្យូទ័រ​បន្ទះ​​របស់​​អ្នក​រយៈ​ពេល <xliff:g id="TIMEOUT">%1$d</xliff:g> វិនាទី។"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"គ្មាន​ការ​កំណត់​ឡើងវិញ​ត្រូវ​បាន​អនុវត្ត ព្រោះ​សេវាកម្ម​សម្អាត​ប្រព័ន្ធ​មិន​អាច​ប្រើ​បាន។"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"កំណត់​ឡើងវិញ?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ការ​កំណត់​ដូច​ចេញ​ពី​រោងចក្រ​ឡើង​វិញ​មិន​អាច​ប្រើ​បាន​សម្រាប់​អ្នក​ប្រើ​ម្នាក់​នេះ"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"លុប"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"សូម​រង់ចាំ..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"លុប​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"លុប​កាត​អេសឌី"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"លុប​ទិន្នន័យ​ទាំងអស់​ក្នុង​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"រក្សាសិទ្ធិ"</string>
     <string name="license_title" msgid="1990487604356037871">"អាជ្ញាប័ណ្ណ"</string>
     <string name="terms_title" msgid="7697580845616764642">"លក្ខខណ្ឌ​ប្រើប្រាស់"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"អាជ្ញាប័ណ្ណ​កម្មវិធី​ប្រភព​កូដ​ចំហ"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"មាន​បញ្ហា​ក្នុង​ការ​ផ្ទុក​អាជ្ញាប័ណ្ណ។"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"កំពុង​ផ្ទុក..."</string>
@@ -1845,8 +1848,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"អ្នក​ត្រូវ​តែ​កំណត់​ពាក្យសម្ងាត់ ឬ​កូដ​ PIN ចាក់​សោ​អេក្រង់ មុន​នឹង​អ្នក​អាច​ប្រើ​ការ​ផ្ទុក​​​ព័ត៌មាន​សម្ងាត់។"</string>
     <string name="usage_access_title" msgid="332333405495457839">"កម្មវិធី​មាន​សិទ្ធិ​ប្រើប្រាស់"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"អនុញ្ញាត​ឲ្យ​ចូល​ដំណើរការ?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"បើ​អ្នក​អនុញ្ញាត​ចូល​ដំណើរការ កម្មវិធី​នេះ​អាច​មើល​ព័ត៌មាន​ទូទៅ​អំពី​កម្មវិធី​លើ​ឧបករណ៍​របស់​អ្នក ដូច​ជា​តើ​អ្នកប្រើ​ពួកវា​ញឹកញាប់​ប៉ុណ្ណា។"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"សំឡេង​ពេលអាសន្ន"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"កំណត់​ឥរិយាបថ​ពេល​ហៅ​ពេល​មាន​អាសន្ន"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"បម្រុងទុក &amp; កំណត់​ឡើងវិញ"</string>
@@ -2033,11 +2035,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"ដែន​កំណត់​ដំណើរការ​ក្នុង​ផ្ទៃ​ខាង​ក្រោយ"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"បង្ហាញ ANRs ទាំងអស់"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"បង្ហាញ​ប្រអប់​កម្មវិធី​មិន​ឆ្លើយតប​សម្រាប់​កម្មវិធី​ផ្ទៃ​ខាង​ក្រោយ"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"សូម​ប្រើ​កម្មវិធី GoogleSettings សម្រាប់​ប្រតិបត្តិការ​នេះ"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"កាត់បន្ថយការប្រើប្រាស់បណ្ដាញ WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"កាត់បន្ថយ​ការ​ប្រើ​បណ្ដាញ​ដោយ​កំណត់​ប្រូកស៊ី​ការ​ភ្ជាប់ WebView តាមរយៈ​ម៉ាស៊ីន​មេ​​បង្ហាប់ Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ការ​ប្រើ​ទិន្នន័យ"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ការប្រើទិន្នន័យកម្មវិធី"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"​គណនេយ្យ​ទិន្នន័យ​ក្រុមហ៊ុន​បញ្ជូន​អាច​ខុស​ពី​ឧបករណ៍​របស់​អ្នក។"</string>
@@ -2481,4 +2481,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"ពេល​ការ​កំណត់​នេះ​ត្រូវ​បាន​បើក អ្នក​អាច​ដាក់​ឧបករណ៍​ក្នុង​សភាព​ដែល​រក្សា​ទិដ្ឋភាព​អេក្រង់​បច្ចុប្បន្ន។\n\nដើម្បី​ភ្ជាប់​អេក្រង់៖\n\n១. បើក​ការ​កំណត់​នេះ។\n\n២. បើក​កម្មវិធី។\n\n៣. ប៉ះ​ប៊ូតុង​ថ្មីៗ។\n\n៤. ប៉ះ​រូបតំណាង​ភ្ជាប់។"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"ប្រវត្តិរូប​ការងារ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ពិសោធន៍​)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"នៅ​ពេល​បង្វិល​ឧបករណ៍"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"បង្វិល​មាតិកា​អេក្រង់"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ស្ថិតនៅ​ក្នុង​ទិដ្ឋភាព​បញ្ឈរ"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ស្ថិតនៅ​​ក្នុង​ទិដ្ឋភាព​ទេសភាព"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ស្ថិត​នៅ​ក្នុង​​ទិស​ដៅ​​បច្ចុប្បន្ន"</string>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 2fdfa19..824bf75 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ಜೋಡಣೆ ವಿನಂತಿ"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ದೊಂದಿಗೆ ಜೋಡಿಸುವುದಕ್ಕಾಗಿ ಸ್ಪರ್ಶಿಸಿ."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ಸ್ವೀಕರಿಸಿದ ಫೈಲ್‌ಗಳನ್ನು ತೋರಿಸು"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth ಸಾಧನದ ಆಯ್ಕೆ"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth ಅನುಮತಿ ವಿನಂತಿ"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Bluetooth ಆನ್‌ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ ಬಯಸುತ್ತದೆ."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"<xliff:g id="TIMEOUT">%1$d</xliff:g> ಸೆಕೆಂಡುಗಳವರೆಗೆ ಇತರ Bluetooth ಸಾಧನಗಳಿಗೆ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ ಗೋಚರಿಸುವಂತೆ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ ಬಯಸುತ್ತದೆ."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"ಸಿಸ್ಟಂ ತೆರವುಗೊಳಿಸುವ ಸೇವೆಯು ಲಭ್ಯವಿಲ್ಲದಿರುವ ಕಾರಣ ಮರುಹೊಂದಿಸುವಿಕೆಯನ್ನು ನಿರ್ವಹಿಸಲಾಗಲಿಲ್ಲ."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ಮರುಹೊಂದಿಸುವುದೇ?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ಈ ಬಳಕೆದಾರರಿಗೆ ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಕೆ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"ಅಳಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸು"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD ಕಾರ್ಡ್‌ ಅಳಿಸು"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"ಹಕ್ಕುಸ್ವಾಮ್ಯ"</string>
     <string name="license_title" msgid="1990487604356037871">"ಪರವಾನಗಿ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ನಿಯಮಗಳು ಮತ್ತು ಷರತ್ತುಗಳು"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ತೆರೆದ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ಪರವಾನಗಿಗಳನ್ನು ಲೋಡ್‌ ಮಾಡುವಲ್ಲಿ ಸಮಸ್ಯೆ ಇದೆ."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ಲೋಡ್ ಆಗುತ್ತಿದೆ..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"ನೀವು ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಬಳಸುವ ಮೊದಲು ನೀವು ಲಾಕ್‌ ಸ್ಕ್ರೀನ್‌ PIN ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
     <string name="usage_access_title" msgid="332333405495457839">"ಬಳಕೆಯ ಪ್ರವೇಶದೊಂದಿಗೆ ಅಪ್ಲಿ"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"ನೀವು ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿದರೆ, ನೀವು ಹೇಗೆ ಅವುಗಳನ್ನು ಬಳಸುತ್ತೀರಿ ಎಂಬುದನ್ನು ಒಳಗೊಂಡಂತೆ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಕುರಿತ ಸಾಮಾನ್ಯ ಮಾಹಿತಿಯನ್ನು ಈ ಅಪ್ಲಿಕೇಶನ್‌ ವೀಕ್ಷಿಸಬಹುದು."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"ತುರ್ತು ಟೋನ್"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ತುರ್ತು ಕರೆ ಮಾಡಿದಾಗ ಕಾರ್ಯ ರೀತಿಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"ಬ್ಯಾಕಪ್ &amp; ಮರುಹೊಂದಿಕೆ"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"ಹಿನ್ನೆಲೆ ಪ್ರಕ್ರಿಯೆ ಮಿತಿ"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"ಎಲ್ಲ ANR ಗಳನ್ನು ತೋರಿಸು"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"ಹಿನ್ನೆಲೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗಾಗಿ ಅಪ್ಲಿಕೇಶನ್ ಪ್ರತಿಕ್ರಿಯಿಸುತ್ತಿಲ್ಲ ಎಂಬ ಸಂಭಾಷಣೆ ತೋರಿಸು"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"ಈ ಕಾರ್ಯಾಚರಣೆಗಾಗಿ ದಯವಿಟ್ಟು GoogleSettings ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಿ"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView ನೆಟ್. ಬಳಕೆ ಕಡಿಮೆ"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Google ಕಂಪ್ರೆಷನ್ ಸರ್ವರ್‌ಗಳ ಮೂಲಕ WebView ಸಂಪರ್ಕಗಳನ್ನು ಪ್ರಾಕ್ಸಿ ಮಾಡುವುದರ ಮೂಲಕ ನೆಟ್‌ವರ್ಕ್ ಬಳಕೆಯನ್ನು ಕಡಿಮೆಮಾಡಿ"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"ವಾಹಕ ಡೇಟಾ ಲೆಕ್ಕಾಚಾರವು ನಿಮ್ಮ ಸಾಧನಕ್ಕಿಂತ ಭಿನ್ನವಾಗಿರಬಹುದು."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"ಈ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ಆನ್ ಮಾಡಿದಾಗ, ನೀವು ಸಾಧನವನ್ನು ಪ್ರಸ್ತುತ ಪರದೆಯನ್ನು ವೀಕ್ಷಣೆಯಲ್ಲಿಡುವ ಸ್ಥಿತಿಯಲ್ಲಿ ಇರಿಸಬಹುದು.\n\nಸ್ಕ್ರೀನ್ ಅನ್ನು ಪಿನ್ ಮಾಡಲು:\n\n1. ಈ ಸೆಟ್ಟಿಂಗ್ ಆನ್ ಮಾಡಿ.\n\n2. ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಿರಿ.\n\n3. ಇತ್ತೀಚಿನವುಗಳ ಬಟನ್ ಸ್ಪರ್ಶಿಸಿ.\n\n4. ಪಿನ್ ಐಕಾನ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ಪ್ರಾಯೋಗಿಕ)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"ಸಾಧನವನ್ನು ತಿರುಗಿಸಿದಾಗ"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"ಪರದೆಯ ವಿಷಯಗಳನ್ನು ತಿರುಗಿಸಿ"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ಪೋಟ್ರೇಟ್‌‌ ವೀಕ್ಷಣೆಯಲ್ಲಿ ಉಳಿಯಿರಿ"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ಲ್ಯಾಂಡ್‌ಸ್ಕೇಪ್ ವೀಕ್ಷಣೆಯಲ್ಲಿ ಉಳಿಯಿರಿ"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ಪ್ರಸ್ತುತ ಓರಿಯಂಟೇಶನ್‌ನಲ್ಲಿ ಉಳಿಯಿರಿ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 29ec07c..351554e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"페어링 요청"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하려면 터치하세요."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"받은 파일 보기"</string>
-    <string name="device_picker" msgid="8398232791303186677">"블루투스 기기 선택기"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"블루투스 권한 요청"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"앱에서 블루투스를 사용하도록 설정하려고 합니다."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"앱에서 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"시스템 지우기 서비스를 사용할 수 없어 초기화하지 못했습니다."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"초기화하시겠습니까?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"초기화를 수행할 권한이 없는 사용자입니다."</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"지우는 중"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"잠시 기다려 주세요..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB 저장소 지우기"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD 카드 지우기"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB 저장소의 모든 데이터 지우기"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"저작권"</string>
     <string name="license_title" msgid="1990487604356037871">"라이선스"</string>
     <string name="terms_title" msgid="7697580845616764642">"약관"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"오픈소스 라이선스"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"라이선스를 로드하는 동안 문제가 발생했습니다."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"로드 중..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"자격증명 저장소를 사용하려면 먼저 화면 잠금 PIN 또는 비밀번호를 설정해야 합니다."</string>
     <string name="usage_access_title" msgid="332333405495457839">"사용 액세스 권한을 보유한 앱"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"액세스를 허용하시겠습니까?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"액세스를 허용하는 경우 이 앱에서 내 기기의 앱에 대한 일반적인 정보(예: 앱 사용 빈도)를 볼 수 있습니다."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"긴급 신호음"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"긴급 통화 중 동작 설정"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"백업 및 초기화"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"백그라운드 프로세스 수 제한"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"모든 ANR 보기"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"백그라운드 앱에 대해 앱 응답 없음 대화상자 표시"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"이 작업을 하려면 Google 설정 앱을 사용해 주시기 바랍니다."</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView 네트워크 사용량 줄이기"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Google 압축 서버를 통해 WebView 연결을 프록시하여 네트워크 사용량을 줄이세요."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"데이터 사용량"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"앱 데이터 사용"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"이동통신사 데이터 사용량 계산은 기기와 다를 수 있습니다."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"이 설정을 사용하면 기기에서 현재 화면을 유지할 수 있습니다.\n\n화면을 고정하려면 다음 단계를 따르세요.\n\n1. 이 설정을 사용하도록 선택합니다.\n\n2. 앱을 엽니다.\n\n3. 최근 버튼을 터치합니다.\n\n4. 핀 아이콘을 터치합니다."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"직장 프로필"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(베타)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"기기 회전 시"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"화면 콘텐츠 회전"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"세로 보기 유지"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"가로 보기 유지"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"현재 방향 유지"</string>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 3b6d51c..692e699 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -236,7 +236,8 @@
     <skip />
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен туташуу үчүн тийиңиз."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Кабыл алынган файлдар"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth түзмөк тандагычы"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <!-- no translation found for bluetooth_permission_request (1523129741266262748) -->
     <skip />
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Колдонмо Bluetooth\'ду жандырууну каалайт."</string>
@@ -1512,10 +1513,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Тазалоо аткарылган жок, анткени System Clear кызматы жеткиликсиз."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Тазалансынбы?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Бул колдонуучу демейки абалга келтире албайт"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Өчүрүүдө"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Күтө туруңуз…"</string>
     <!-- no translation found for media_format_title (3999653431422767156) -->
     <skip />
     <!-- no translation found for media_format_title (4427528440306787972) -->
@@ -1654,6 +1653,10 @@
     <skip />
     <!-- no translation found for terms_title (7697580845616764642) -->
     <skip />
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <!-- no translation found for settings_license_activity_title (7553683406244228650) -->
     <skip />
     <!-- no translation found for settings_license_activity_unavailable (4210539215951487627) -->
@@ -2625,8 +2628,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Сертификат сактагычты пайдаланаардан мурун, сиз экранды бөгөтөөчү PIN же сырсөз коюшуңуз керек."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Пайдалануу уруксаты бар колд."</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Мүмкүнчүлүк берилсинби?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Эгер кирүүгө уруксат берсеңиз, бул колдонмо түзмөгүңүздөгү колдонмолор боюнча, аларды канча убакыт аралыгында пайдаланарыңыз сыяктуу, жалпы маалыматты көрө алат."</string>
     <!-- no translation found for emergency_tone_title (1055954530111587114) -->
     <skip />
     <!-- no translation found for emergency_tone_summary (722259232924572153) -->
@@ -2885,11 +2887,9 @@
     <skip />
     <string name="show_all_anrs" msgid="28462979638729082">"Бардык ANR\'лерди көрсөтүү"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Фондогу колдонмолорго Колдонмо Жооп Бербейт деп көрсөтүү"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Бул иш аракет үчүн GoogleЖөндөөлөрү колдонмосун пайдаланыңыз"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView тармагын азыраак колдонуу"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"WebView туташууларын Google кысуу серверлери аркылуу проксилештирип тармакты азыраак колдонуу"</string>
     <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
     <skip />
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Колдонмонун дайындарынын пайдаланылышы"</string>
@@ -3382,4 +3382,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Бул жөндөө күйгүзүлгөндө, түзмөк учурдагы экранды көрсөтүп турган абалга коюлат.\n\nЭкранды кадап коюу үчүн:\n\n1. Бул жөндөөнү күйгүзүңүз.\n\n2. Колдонмону ачыңыз.\n\n3. Акыркылар баскычына тийип коюңуз.\n\n4. Кадагыч сүрөтчөсүнө тийиңиз."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Жумуш профили"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Сынамык)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Түзмөк айланганда"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Экрандын мазмундарын айландыруу"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Тигинен көрүнүштө кала берсин"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Туурасынан көрүнүштө кала берсин"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Учурдагы багытта кала берсин"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 62fe5f1..ce2a631 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ຄຳຮ້ອງຂໍການຈັບຄູ່"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"ແຕະເພື່ອຈັບຄູ່ກັບ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ສະແດງໄຟລ໌ທີ່ໄດ້ຮັບ"</string>
-    <string name="device_picker" msgid="8398232791303186677">"ໂຕເລືອກອຸປະກອນ Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"ຄຳຂໍອະນຸຍາດເພື່ອໃຊ້ Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"ມີແອັບຯຕ້ອງການເປີດນຳໃຊ້ Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"ມີແອັບຯຕ້ອງການໃຫ້ແທັບເລັດຂອງທ່ານ ສາມາດຊອກເຫັນໄດ້ຈາກອຸປະກອນ Bluetooth ອື່ນເປັນເວລາ <xliff:g id="TIMEOUT">%1$d</xliff:g> ວິນາທີ."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"ບໍ່ໄດ້ດຳເນີນການຣີເຊັດເທື່ອ ເນື່ອງຈາກບໍລິການ System Clear ບໍ່ສາມາດເຮັດວຽກໄດ້."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ຕ້ອງການຣີເຊັດບໍ່?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ຜູ່​ໃຊ້​ນີ້​ບໍ່​ສາ​ມາດ​ຣີ​ເຊັດ​ຄ່າ​ໂຮງ​ງານ​​ໄດ້"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"ກຳລັງລຶບ"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"ກະລຸນາລໍຖ້າ..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"ລຶບບ່ອນຈັດເກັບຂໍ້ມູນ USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"ລຶບ SD card"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"ລຶບຂໍ້ມູນທັງໝົດໃນບ່ອນຈັດເກັບຂໍ້ມູນ USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"ສະຫງວນລິຂະສິດ"</string>
     <string name="license_title" msgid="1990487604356037871">"ລິຂະສິດ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ຂໍ້ກຳນົດ ແລະເງື່ອນໄຂ"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ລິຂະສິດໂອເພນຊອດ"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ເກີດບັນຫາໃນການໂຫຼດຂໍ້ມູນລິຂະສິດ."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ກຳລັງໂຫລດ..."</string>
@@ -2470,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"ເມື່ອ​ການ​ຕັ້ງ​ຄ່າ​ນີ້​ຖືກ​ເປີດ​ໃຊ້​ແລ້ວ, ທ່ານ​ຈະ​ສາ​ມາດ​ກຳ​ນົດ​ໃຫ້​ອຸ​ປະ​ກອນ​​ສະ​ແດງ​ໜ້າ​ຈໍ​ປັດ​ຈຸ​ບັນ​ໄດ້.\n\nເພື່ອ​ປັກ​ໝຸດ​ໜ້າ​ຈໍ:\n\n1. ເປີດ​ໃຊ້​ການ​ຕັ້ງ​ຄ່າ​ນີ້.\n\n2. ເປີດ​ແອັບຯ​ໃດ​ນຶ່ງ​ທີ່​ຕ້ອງ​ການ.\n\n3. ແຕະ​ທີ່​ປຸ່ມ​ \"ເມື່ອ​ໄວໆ​ນີ້\".\n\n4. ແຕະ​ທີ່​ເຄື່ອງ​ໝາຍ​ປັກ​ໝຸດ."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"​ໂປຣ​ໄຟລ໌​ບ່ອນ​ເຮັດ​ວຽກ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ທົດ​ລອງ)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"ເມື່ອ​ໝຸນ​ອຸປະກອນ"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"ໝຸນ​ເນື້ອຫາ​ຂອງ​ໜ້າຈໍ"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ໃຊ້​ທິດທາງ​ລວງຕັ້ງ"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ໃຊ້​ທິດທາງ​ລວງ​ນອນ"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ໃຊ້ທິດທາງ​ປັດຈຸບັນ​ຂອງ​ໜ້າ​ຈໍ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index cf8d11f..cd2d58d 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Susiejimo užklausa"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Jei norite susieti su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“, palieskite."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Rodyti gautus failus"</string>
-    <string name="device_picker" msgid="8398232791303186677">"„Bluetooth“ įrenginio pasirinkimo priemonė"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"„Bluetooth“ leidimo užklausa"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Programa nori įjungti „Bluetooth“."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Programa nori padaryti planšetinį kompiuterį <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų „Bluetooth“ įrenginių."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Nebuvo nustatyta iš naujo, nes paslauga „Sistemos išvalymas“ nepasiekiama."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Nustatyti iš naujo?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Šis naudotojas negali atkurti gamyklinių nustatymų"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Ištrinama"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Palaukite..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ištrinti USB atmintinę"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Ištrinti SD kortelę"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Ištrin. visi USB atm. duomenys"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Autorių teisės"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencija"</string>
     <string name="terms_title" msgid="7697580845616764642">"Taisyklės ir nuostatos"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Atvirojo šaltinio licencijos"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Įkeliant licencijas iškilo problema."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Įkeliama…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Jei norite naudoti kredencialų atmintinę, pirmiausia turite nustatyti ekrano užrakto PIN kodą arba slaptažodį."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Progr., gal. pasiekti duom."</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Leisti pasiekti?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Jei leisite pasiekti duomenis, ši programa galės peržiūrėti bendrą informaciją apie įrenginio programas, pvz., kaip dažnai jas naudojate."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Pagalbos tonas"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nustatyti elgesį, kai skambinama pagalbos numeriu"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Kurti atsarginę kopiją ir nustatyti iš naujo"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Fono procesų apribojimas"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Rodyti visus ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Fon. programose rodyti dialogo langą „Neatsako“"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Naudokite „Google“ nustatymų programą šiai operacijai atlikti"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Sum. „WebView“ tin. naud."</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Sumažinkite tinklo duomenų naudojimą „WebView“ ryšius perduodami per „Google“ tarpinius glaudinimo serverius"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Duomenų naudojimas"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Programos duomenų naud."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatoriaus duomenų apskaita gali skirtis nuo jūsų įrenginio apskaitos."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Kai šis nustatymas įjungtas, galite nustatyti būseną, kad būtų rodomas dabartinis ekranas.\n\nJei norite prisegti ekraną:\n\n1. Įjunkite šį nustatymą.\n\n2. Atidarykite programą.\n\n3. Palieskite mygtuką „Naujausi“.\n\n4. Palieskite smeigtuko piktogramą."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Darbo profilis"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentinis)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kai įrenginys pasukamas"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Pasukti ekrano turinį"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Išlaikyti stačiąjį rodinį"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Išlaikyti gulsčiąjį rodinį"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Išlaikyti esamą orientaciją"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 495d0e3..4aaaf1b 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pāra izveides pieprasījums"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Pieskarieties, lai izveidotu savienojumu pārī ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Rādīt saņemtos failus"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth ierīces izvēle"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth atļaujas pieprasījums"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu. Vai atļaut?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Planšetdatorā instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt planšetdatoru redzamu citām Bluetooth ierīcēm."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Atiestatīšana netika veikta, jo nav pieejams pakalpojums Sistēmas tīrīšana."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vai atiestatīt?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Šim lietotājam nav pieejama rūpnīcas datu atiestatīšana."</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Notiek dzēšana"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Lūdzu, uzgaidiet…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Dzēst USB krātuvi"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Dzēst SD karti"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Dzēš visus datus USB krātuvē"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Autortiesības"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Pakalpojumu sniegšanas noteikumi"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Atklātā pirmkoda licences"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Radās ar licenču ielādi saistīta problēma."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Notiek ielāde…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Lai varētu izmantot akreditācijas datu atmiņu, ir jāiestata bloķēšanas ekrāna PIN vai parole."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Piekļuve lietojuma datiem"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Vai atļaut piekļuvi?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Ja atļausiet piekļuvi, šī lietotne varēs skatīt vispārīgo informāciju par jūsu ierīcē esošajām lietotnēm, piemēram, to izmantošanas biežumu."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ārkārtas signāls"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Iestatīt uzvedību, kad tiek veikts ārkārtas zvans"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Dublēt un atiestatīt"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Fona procesu ierobežojums"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Rādīt visus ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Rādīt fona lietotņu dialoglodz. Lietotne nereaģē"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Lai veiktu šo darbību, lūdzu, izmantojiet lietotni Google iestatījumi."</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Samazināt WebView tīkla liet."</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Samaziniet tīkla lietojumu, kā starpnieku izmantojot WebView savienojumus, kurus nodrošina Google saspiešanas serveri"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datu lietojums"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Lietotnes datu lietojums"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilo sakaru operatora datu uzskaite var atšķirties no datu uzskaites ierīcē."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Ieslēdzot šo iestatījumu, varat ierīcē aktivizēt režīmu, kurā tiek fiksēts pašlaik skatītais ekrāns.\n\nLai piespraustu ekrānu, veiciet tālāk norādītās darbības.\n\n1. Ieslēdziet šo iestatījumu.\n\n2. Atveriet lietotni.\n\n3. Pieskarieties pogai Pēdējās.\n\n4. Pieskarieties piespraušanas ikonai."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Darba profils"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentāla)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kad ierīce tiek pagriezta"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Pagriezt ekrāna saturu"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Saglabāt portreta skatu"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Saglabāt ainavas skatu"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Saglabāt pašreizējo virzienu"</string>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 1e1574b..229193d 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Барање за спарување"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Допри за да се спари со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Прикажи добиени датотеки"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Уред за избирање Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Барање за дозвола на Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Апликација сака да се вклучи Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Апликација сака таблетот да се направи видлив за други Bluetooth уреди за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Не се изврши ресетирање зашто услугата за чистење на системот не е достапна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Ресетирај?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Фабричкото ресетирање не е достапно за овој корисник"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Се брише"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Почекајте..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Избриши УСБ меморија"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Избриши СД картичка"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Избриши ги сите податоци во УСБ меморијата"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Авторски права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
     <string name="terms_title" msgid="7697580845616764642">"Правила и услови"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лиценци на софтвер со отворен код"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Постои проблем при вчитување на лиценците."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Се вчитува..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Треба да поставите ПИН или лозинка за заклучување на екранот пред да може да ја користите меморијата за акредитиви."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Апликации со пристап до корис."</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Да се дозволи пристап?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Ако го дозволите пристапот, апликацијата ќе може да ги гледа општите информации за апликациите на вашиот уред, како на пример, колку често ги користите."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за итен повик"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Подеси однесување кога се прави итен повик"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Резервна копија и ресетирање"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Граница на процес во зад."</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Прикажи ги сите ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Прикажи „Апл. не реагира“ за. апл. во заднина"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Користете ја апликацијата GoogleSettings за ова дејство"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Намалете мрежно користење на WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Намалете го користењето на мрежата, така што ќе ги посредувате поврзувањата WebView преку серверите за компресија на Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Користење податоци"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Корист. подат. на аплик."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Пресметувањето податоци на операторот може да се разликува од вашиот уред."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Кога е вклучена поставката, може уредот да го ставите во состојба во која се прикажува моменталниот екран.\n\nЗа да закачите екран:\n\n1. Вклучете ја поставката.\n\n2. Отворете апликација.\n\n3. Допрете го копчето „Скорешни“.\n\n4. Допрете ја иконата игла."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Работен профил"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Кога уредот се ротира"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ротирај ја содржината на екранот"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Остани во приказ на портрет"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Остани во приказ на пејзаж"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Остани во тековната ориентација"</string>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 94351d9..43dae9d 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ജോടിയാക്കൽ അഭ്യർത്ഥന"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്നതുമായി ജോടിയാക്കാൻ സ്‌പർശിക്കുക."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ലഭിച്ച ഫയലുകൾ ദൃശ്യമാക്കുക"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth ഉപകരണം തിരഞ്ഞെടുക്കൽ"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth അനുമതി അഭ്യർത്ഥന"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"ഒരു അപ്ലിക്കേഷൻ Bluetooth ഓണാക്കാൻ താൽപ്പര്യപ്പെടുന്നു."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"ഒരു അപ്ലിക്കേഷൻ <xliff:g id="TIMEOUT">%1$d</xliff:g> സെക്കൻഡ് നേരത്തേക്ക് നിങ്ങളുടെ ടാബ്‌ലെറ്റ് മറ്റ് Bluetooth ഉപകരണങ്ങൾക്ക് ദൃശ്യമാക്കാൻ താൽപ്പര്യപ്പെടുന്നു."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"സി‌സ്റ്റം മായ്ക്കുക സേവനം ലഭ്യമല്ലാത്തതിനാൽ പുനഃസജ്ജീകരണമൊന്നും നടത്തിയില്ല."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"പുനഃസജ്ജമാക്കണോ?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ഈ ഉപയോക്താവിനായി ഫാക്‌ടറി പുനഃസജ്ജമാക്കൽ ലഭ്യമല്ല"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"മായ്‌ക്കുന്നു"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"കാത്തിരിക്കുക..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB സംഭരണം മായ്ക്കുക"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD കാർഡ് മായ്ക്കുക"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB സംഭരണത്തിലെ എല്ലാ ഡാറ്റയും മായ്ക്കുന്നു"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"പകര്‍പ്പവകാശം"</string>
     <string name="license_title" msgid="1990487604356037871">"ലൈസന്‍സ്"</string>
     <string name="terms_title" msgid="7697580845616764642">"നിബന്ധനകളും വ്യവസ്ഥകളും"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ഓപ്പൺ സോഴ്‌സ് ലൈസൻസുകൾ"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ലൈസൻസുകൾ ലോഡുചെയ്യുന്നതിൽ ഒരു പ്രശ്നമുണ്ട്."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ലോഡുചെയ്യുന്നു..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"ക്രെഡൻഷ്യൽ സംഭരണം ഉപയോഗിക്കുന്നതിന് മുമ്പ് നിങ്ങൾ ഒരു ലോക്ക് സ്‌ക്രീൻ PIN അല്ലെങ്കിൽ പാസ്‌വേഡ് സജ്ജീകരിക്കേണ്ടതുണ്ട്."</string>
     <string name="usage_access_title" msgid="332333405495457839">"ഉപയോഗ ആക്‌സസ്സ് ഉള്ള അപ്ലിക്കേഷനുകൾ"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"ആക്‌സസ്സ് അനുവദിക്കണോ?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"നിങ്ങൾ ആക്‌സസ്സ് അനുവദിക്കുകയാണെങ്കിൽ, നിങ്ങളുടെ ഉപകരണത്തിലുള്ള അപ്ലിക്കേഷനുകൾ എത്ര തവണ ഉപയോഗിച്ചു എന്നിവപോലുള്ള കാര്യങ്ങളെക്കുറിച്ചുള്ള പൊതുവായ വിവരങ്ങൾ ഈ അപ്ലിക്കേഷന് കാണാനാകും."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"അടിയന്തര ടോൺ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ഒരു അടിയന്തര കോൾ ലഭിക്കുന്ന സമയത്തെ പ്രവർത്തരീതി സജ്ജീകരിക്കുക"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"ബാക്കപ്പുചെയ്‌ത് സജ്ജീകരിക്കൂ"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"പശ്ചാത്തല പ്രോസ‌സ്സ് പരിധി"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"എല്ലാ ANR-കളും ദൃശ്യമാക്കുക"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"പ‌ശ്ചാത്തല അപ്ലിക്കേഷനുകൾക്ക് അപ്ലിക്കേഷൻ പ്രതികരിക്കുന്നില്ല എന്ന ഡയലോഗ് കാണിക്കുക"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"ഈ പ്രവർത്തനത്തിനായി Google ക്രമീകരണങ്ങളുടെ അപ്ലിക്കേഷൻ ഉപയോഗിക്കുക"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView നെറ്റ്‌വർക്ക് ഉപയോഗം കുറ‌യ്‌ക്കുക"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Google കംപ്രഷൻ സെർവറുകളിലൂടെ WebView കണക്ഷനുകൾ പ്രോക്‌സി ചെയ്‌തുകൊണ്ട് നെറ്റ്‌വർക്ക് ഉപയോഗം കുറയ്‌ക്കുക"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ഡാറ്റ ഉപയോഗം"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"അപ്ലിക്കേഷൻ ഡാറ്റ ഉപയോഗം"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"കാരിയർ ഡാറ്റ കണക്കാക്കുന്നത് ഉപകരണത്തിൽ നിന്നും വ്യത്യാസപ്പെട്ടിരിക്കാം."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"ഈ ക്രമീകരണം ഓണാക്കുമ്പോൾ, ഉപകരണത്തെ നിലവിലെ സ്ക്രീനിനെ ദൃശ്യമാക്കി നിലനിർത്തുന്ന നിലയിലാക്കാനാകും.\n\nഒരു സ്ക്രീൻ പിൻ ചെയ്യുന്നതിന്:\n\n1. ഈ ക്രമീകരണം ഓണാക്കുക.\n\n2. ഒരു അപ്ലിക്കേഷൻ തുറക്കുക.\n\n3. \'അടുത്തിടെയുള്ളവ\' ബട്ടൺ സ്‌പർശിക്കുക.\n\n4. പിൻ ഐക്കൺ സ്‌പർശിക്കുക."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(പരീക്ഷണാത്മകം)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"ഉപകരണം തിരിക്കുമ്പോൾ"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"സ്‌ക്രീനിന്റെ ഉള്ളടക്കങ്ങൾ തിരിക്കുക"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"പോർട്രെയ്റ്റ് കാഴ്‌ചയിൽ തുടരുക"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ലാൻഡ്‌സ്‌കേപ്പ് കാഴ്‌ചയിൽ തുടരുക"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"നിലവിലുള്ള ഓറിയന്റേഷനിൽ തുടരുക"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index beeac91..7825a72 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Хослуулах хүсэлт"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-тай хослуулахын тулд хүрнэ үү"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Хүлээн авсан файлуудыг харуулах"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Блютүүт төхөөрөмж сонгогч"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Блютүүт зөвшөөрөл шаардлагатай"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Апп блютүүтийг асаахыг хүсч байна."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Апп таны таблетыг бусад блютүүт төхөөрөмжүүдэд <xliff:g id="TIMEOUT">%1$d</xliff:g> секундын турш харагдуулахыг хүсч байна."</string>
@@ -1136,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Зохиогчийн эрх"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценз"</string>
     <string name="terms_title" msgid="7697580845616764642">"Ерөнхий нөхцлүүд"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Нээлттэй Эхийн Лиценз"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Лицензүүдийг ачааллах явцад алдаа гарлаа."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Ачаалж байна..."</string>
@@ -2468,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Энэ тохиргоог идэвхжүүлсэн үед та одоогийн дэлгэцийн харагдацыг хадгалахаар төхөөрөмжийн төлвийг тохируулж болно.\n\nДэлгэцийг хадгалахын тулд:\n\n1. Энэ тохиргоог асаана.\n\n2. Апп-г нээнэ.\n\n3. Саяхны товчинд хүрнэ.\n\n4. Хатгуурын дүрсэнд хүрнэ."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Ажлын профайл"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Туршилтын)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Төхөөрөмжийг эргүүлсэн үед"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Дэлгэцийн контентийг эргүүлэх"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Босоо харагдацаар хадгалах"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Хөндлөн харагдацаар хадгалах"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Одоогийн байрлалаар хадгалах"</string>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index ee5f7df..8094434 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"जोडणी विनंती"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> सह जोडण्यासाठी स्पर्श करा."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"प्राप्त झालेल्या फायली दर्शवा"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth डिव्हाइस निवडकर्ता"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth परवानगी विनंती"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"एका अॅपला Bluetooth चालू करण्याची आवश्यकता आहे."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"एका अॅपला आपला टॅब्लेट इतर Bluetooth डिव्हाइसेससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता दृश्यमान बनविण्याची आवश्यकता आहे."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"सिस्टम साफ करा सेवा उपलब्ध नसल्यामुळे कोणतेही रीसेट केले नाही."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करायचे?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"या वापरकर्त्यासाठी फॅक्‍टरी रीसेट उपलब्‍ध नाही"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"मिटवत आहे"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"कृपया प्रतीक्षा करा..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB संचयन मिटवा"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD कार्ड मिटवा"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB संचयनातील सर्व डेटा मिटवतो"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"परवाना"</string>
     <string name="terms_title" msgid="7697580845616764642">"अटी आणि नियम"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"मुक्त स्त्रोत परवाने"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"परवाने लोड करताना समस्या आली."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"लोड करत आहे..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"आपण क्रेडेन्शियल संचयन वापरु शकण्यापूर्वी आपल्याला एक लॉक स्क्रीन पिन ‍किंवा संकेतशब्द सेट करण्याची आवश्यकता आहे."</string>
     <string name="usage_access_title" msgid="332333405495457839">"वापर प्रवेशासह अ‍ॅप्स"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"प्रवेशाची अनुमती द्यायची?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"आपण प्रवेशास अनुमती दिल्यास, हा अॅप आपल्या डिव्हाइसवरील अॅप्सविषयी सामान्य माहिती पाहू शकतो जसे की आपण ते किती वारंवार वापरता."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"आणीबाणी टोन"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"आणीबाणी कॉल केला जातो तेव्हा वर्तन सेट करा"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"बॅकअप घ्या आणि रीसेट करा"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"पार्श्वभूमी प्रक्रिया मर्यादा"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"सर्व ANR दर्शवा"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"पार्श्वभूमी अॅप्ससाठी अॅप प्रतिसाद देत नाही संवाद दर्शवा"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"कृपया या ऑपरेशनसाठी GoogleSettings अॅप वापरा"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView नेटवर्क वापर कमी करा"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Google संक्षेप सर्व्हर द्वारे WebView कनेक्शन प्रॉक्सी करून नेटवर्क वापर कमी करा"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"डेटा वापर"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"अॅप डेटा वापर"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"वाहक डेटा गणना आपल्या डिव्हाइसपेक्षा भिन्न असू शकते."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"हे सेटिंग्‍ज चालू असताना, आपण डिव्‍हाइस अशा स्‍थितीमध्‍ये ठेवू शकता जी वर्तमान स्‍क्रीन दृश्‍यामध्‍ये ठेवते.\n\nस्‍क्रीन पिन  करण्‍यासाठी:\n\n1. हे सेटिंग चालू करा.\n\n2. अ‍ॅप उघडा.\n\n3. अलीकडील बटण स्‍पर्श करा.\n\n4. पिन चिन्‍हास स्‍पर्श करा."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"कार्य प्रोफाईल"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"डिव्हाइस फिरविलेले असताना"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"स्क्रीनची सामग्री फिरवा"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"पोर्ट्रेट दृश्यामध्ये रहा"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"भूदृश्य दृश्‍यामध्ये रहा"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिमुखतेमध्ये रहा"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 858a846..dad854b 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Permintaan pasangan"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Sentuh untuk berpasangan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tunjukkan fail yang diterima"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Pemilih peranti Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan kebenaran Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Satu apl ingin menghidupkan Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Satu apl ingin menjadikan tablet anda kelihatan kepada peranti Bluetooth lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Tiada penetapan semula dijalankan kerana perkhidmatan Padam Bersih Sistem tidak tersedia."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Tetapkan semula?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Tetapan semula kilang tidak tersedia untuk pengguna ini"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Memadam"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Sila tunggu..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Padam storan USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Padam kad SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Padam semua data dlm storn USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lesen"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terma dan Syarat"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Lesen sumber terbuka"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Terdapat masalah memuatkan lesen."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Memuatkan..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Anda perlu menetapkan PIN kunci skrin atau kata laluan sebelum anda boleh menggunakan storan bukti kelayakan."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apl dengan akses penggunaan"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Benarkan akses?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Jika anda benarkan akses, apl ini boleh melihat maklumat umum mengenai apl pada peranti anda, seperti kekerapan anda menggunakan apl itu."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nada kecemasan"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Tetapkan tingkah laku semasa membuat panggilan kecemasan"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Penyandaran &amp; penetapan semula"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Had proses latar belakang"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Tunjukkan semua ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Tunjukkan dialog Aplikasi Tidak Memberi Maklum Balas untuk aplikasi latar belakang"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Sila guna apl Tetapan Google untuk operasi ini"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Krgkn Pgunaan Rangkaian"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Kurangkan penggunaan rangkaian dengan memproksi sambungan WebView melalui pelayan pemampatan Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Penggunaan data apl"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Cara pengiraan data pembawa mungkin berbeza dengan peranti anda."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Apabila tetapan ini dihidupkan, anda boleh meletakkan peranti dalam keadaan yang memastikan skrin semasa sentiasa kelihatan.\n\nUntuk menyemat skrin:\n\n1. Hidupkan tetapan ini.\n\n2. Buka apl.\n\n3. Sentuh butang Terkini.\n\n4. Sentuh ikon pin."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profil kerja"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Percubaan)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Apabila peranti diputar"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Putar kandungan skrin"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Kekal dalam paparan potret"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Kekal dalam paparan landskap"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Kekal dalam orientasi semasa"</string>
 </resources>
diff --git a/res/values-my-rMM/arrays.xml b/res/values-my-rMM/arrays.xml
index b1bcf53..d9e4d55 100644
--- a/res/values-my-rMM/arrays.xml
+++ b/res/values-my-rMM/arrays.xml
@@ -63,7 +63,7 @@
     <item msgid="8166647333858618801">"သေးငယ်သော"</item>
     <item msgid="1932071435506638315">"ပုံမှန်"</item>
     <item msgid="38373998008112077">"အကြီးစား"</item>
-    <item msgid="7786168277516233536">"အကြီးစား"</item>
+    <item msgid="7786168277516233536">"ဧရာမ"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"အလွန်နှေးသည်"</item>
@@ -135,7 +135,7 @@
     <item msgid="1701505390737218306">"ဆက်သွယ်ထားပြီး"</item>
     <item msgid="3189211552661432651">"ဖိတ်ခေါ်ထားပြီး"</item>
     <item msgid="3206450250360237549">"မအောင်မြင်ပါ"</item>
-    <item msgid="7785896708926971207">"ရရှိနိုင်သည်"</item>
+    <item msgid="7785896708926971207">"ချိတ်ဆက်နိုင်သော"</item>
     <item msgid="2330782789550628803">"စက်ကွင်းပြင်ပ"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
@@ -339,7 +339,7 @@
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"အတို"</item>
-    <item msgid="2560532955514699713">"အလယ်အလတ်"</item>
+    <item msgid="2560532955514699713">"အတော်အသင့်"</item>
     <item msgid="2372711992605524591">"အရှည်"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
@@ -494,7 +494,7 @@
   </string-array>
   <string-array name="ram_states">
     <item msgid="7088762389498381203">"ပုံမှန်"</item>
-    <item msgid="4517779899383204000">"အလယ်အလတ်"</item>
+    <item msgid="4517779899383204000">"အတော်အသင့်"</item>
     <item msgid="406385694840950802">"နည်းနေသည်"</item>
     <item msgid="4212263919458209842">"စိုးရိမ်ရသည်"</item>
   </string-array>
@@ -505,7 +505,7 @@
   </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ပုံမှန်"</item>
-    <item msgid="866544120205026771">"အလယ်အလတ်"</item>
+    <item msgid="866544120205026771">"အတော်အသင့်"</item>
     <item msgid="7851902244436886890">"နိမ့်"</item>
     <item msgid="3022922196817563960">"အရေးပါ"</item>
   </string-array>
@@ -523,6 +523,6 @@
     <item msgid="2860945127596974299">"နောက်ဆုံး သုံးမှု"</item>
     <item msgid="8610560843693675830">"ကက်ရှ လုပ်ထား (အသုံးပြုမှု)"</item>
     <item msgid="4338089220026248848">"ကက်ရှ လုပ်ထား (အသုံးပြုသူ ဖောက်သည်)"</item>
-    <item msgid="6652164677254579050">"ကက်ရှ လုပ်ထား (ပလာ)"</item>
+    <item msgid="6652164677254579050">"ကက်ရှ် လုပ်ထား (ဗလာ)"</item>
   </string-array>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 68e4340..fbabe87 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -71,7 +71,7 @@
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USBသိုလှောင်မှု ဖျက်ခြင်း"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SDကတ်အား ဖျက်ရန်"</string>
     <string name="small_font" msgid="2295331917424072635">"သေးငယ်ရန်"</string>
-    <string name="medium_font" msgid="2068475425515133701">"အလယ်အလတ်"</string>
+    <string name="medium_font" msgid="2068475425515133701">"အတော်အသင့်"</string>
     <string name="large_font" msgid="599055175160971446">"အကြီးစား"</string>
     <string name="font_size_save" msgid="3450855718056759095">"ကောင်းပြီ"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USBသိုလှောင်ကိရိယာ"</string>
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"တွဲချိတ်ရန် တောင်းခံသည်"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> နှင့် အတူတွဲချိတ်ရန် တို့ထိပါ။"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ရရှိသောဖိုင်များကို ပြရန်"</string>
-    <string name="device_picker" msgid="8398232791303186677">"ဘလူးတုသ်ကိရိယာရွေးချယ်ရန်"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"ဘလူးတုသ်ခွင့်ပြုချက်တောင်းခံသည်"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"အပလီကေးရှင်းတစ်ခုမှ ဘလူးတုသ် ဖွင့်လိုသည်။"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"အပလီကေးရှင်းတစ်ခုမှ သင်၏တက်ဘလက်ကို အခြားဘလူးတုသ်ပစ္စည်းများမှ <xliff:g id="TIMEOUT">%1$d</xliff:g> စက္ကန့် မြင်အောင် လုပ်လိုသည်။"</string>
@@ -275,7 +276,7 @@
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USBသိုလှောင်ကိရိယာ"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD ကဒ်"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ပရော်စီအပြင်အဆင်များ"</string>
-    <string name="cancel" msgid="6859253417269739139">"ပယ်ဖျက်သည်"</string>
+    <string name="cancel" msgid="6859253417269739139">"နေတော့"</string>
     <string name="cancel_all_caps" msgid="3183966387632229461">"ပယ်ဖျက်ရန်"</string>
     <string name="continue_all_caps" msgid="5152713914673789893">"ဆက်လုပ်ရန်"</string>
     <string name="okay" msgid="1997666393121016642">"အိုကေ"</string>
@@ -285,7 +286,7 @@
     <string name="settings_label" msgid="1626402585530130914">"ဆက်တင်များ"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"ဆက်တင်များ"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"ဆက်တင်အတိုကောက်"</string>
-    <string name="airplane_mode" msgid="8837269988154128601">"လေယာဉ်ပျံပေါ်အသုံးပြုသောစနစ်"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"လေယာဉ်ပျံပေါ်သုံးစနစ်"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"နောက်ထပ်"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ကြိုးမဲ့နှင့် ကွန်ယက်များ"</string>
     <string name="radio_controls_summary" msgid="2837395036275123133">"ဝိုင်ဖိုင်၊ ဘလူးတုသ်၊ လေယာဉ်ပျံ မုဒ်၊ ဆယ်လူလာ ကွန်ရက်များ &amp;VPN များကို စီမံခန့်ခွဲရန်"</string>
@@ -381,7 +382,7 @@
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"ကုဒ်ဖြ​​ေခြင်း မအောင်မြင်ပါ"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="3775740783651700375">"သင်ရိုက်ထည့်သော စကားဝှက် မှန်ကန်သော်လည်း၊ သင့်ဒေတာများ ကမောက်ကမဖြစ်နေသည်။\n\nသင့်တက်ဘလက်ကို ဆက်လက်သုံးစွဲရန်အတွက်၊ စက်ရုံထုတ်အခြ​ေအနေသို့ ပြန်ပ​ြောင်းပါ။ ပြန်ညှိပြီးနောက် တက်ဘလက်ကို ပြန်လည်ဖွင့်ကာသုံးစွဲသည့်အခါ၊ သင့် ဂူဂဲလ်အကောင့်ဖြင့် အရန်သိမ်းဆည်းထားသော မည်သည့်ဒေတာမဆို ပြန်လည်ရယူနိုင်ခွင့် ရှိသည်။"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="6898436151871328007">"သင်ရိုက်ထည့်သော စကားဝှက် မှန်ကန်သော်လည်း၊ သင့်ဒေတာများ ကမောက်ကမဖြစ်နေသည်။\n\nသင့်ဖုန်းကို ဆက်လက်သုံးစွဲရန်အတွက်၊ စက်ရုံထုတ်အခြ​ေအနေသို့ ပြန်ပ​ြောင်းပါ။ ပြန်ညှိပြီးနောက် ဖုန်းကို ပြန်လည်ဖွင့်ကာသုံးစွဲသည့်အခါ၊ သင့် ဂူဂဲလ်အကောင့်ဖြင့် အရန်သိမ်းဆည်းထားသော မည်သည့်ဒေတာမဆို ပြန်လည်ရယူနိုင်ခွင့် ရှိသည်။"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"ထည့်သွင်းမှုနည်းလမ်း ပြောင်းလဲရန်"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"စာရိုက်ထည့်ပုံ‌ ပြောင်းရန်"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"မျက်နှာပြင်သော့ပိတ်နည်းရွေးရန်"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"အပိုအတွက်သော့ရွေးပါ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ဖန်သားပြင် သော့ချခြင်း"</string>
@@ -396,7 +397,7 @@
     <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>
+    <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"လုံခြုံရေး အတော်အသင့်"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"ပင်နံပါတ်"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"အလယ်အလတ်မှ မြင့်သော လုံခြုံရေး"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"လျို့ဝှက် နံပါတ်"</string>
@@ -454,8 +455,8 @@
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"စက်ပစ္စည်း အက်ဒ်မင်မှ လတ်တလောသုံးသောစကားဝှက်ကို ခွင့်မပြုပါ။"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"၈ဏန်းမျာကို အငယ်မှအကြီးသို့၊ အကြီးမှအငယ်သို့ သို့မဟုတ် ထပ်တလဲလဲ အစီအစဉ်ကို တားမြစ်ထား"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ကောင်းပြီ"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"ပယ်ဖျက်သည်"</string>
-    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"ပယ်ဖျက်သည်"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"နေတော့"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"နေတော့"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"ရှေ့သို့"</string>
     <string name="lock_setup" msgid="3355847066343753943">"အစီအမံ ပြီးပါပြီ"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"စက်ပိုင်းဆိုင်ရာ အုပ်ချုပ်မှု"</string>
@@ -482,7 +483,7 @@
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">":<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>နှင့်ချိတ်တွဲရန်:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>ကိုရိုက်ထည့်ကာ, Return သို့မဟုတ် Enterကိုနှိပ်ပါ"</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"အတူတွဲပါ"</string>
     <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ချိတ်တွဲရန်"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ပယ်ဖျက်သည်"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"နေတော့"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်မရပါ"</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ပင်နံပါတ် သို့မဟုတ် ဖြတ်သန်းခွင့်ကီးမမှန်ကန်သောကြောင့်<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်မရပါ။"</string>
@@ -503,7 +504,7 @@
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> က သင်၏ အဆက်အသွယ်များ နှင့် ခေါ်ဆိုမှု မှတ်တမ်းကို ရယူလိုသည်။"</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> က ဘလူးတုသ်နှင့် တွဲချိတ်လိုသည်။ ချိတ်ဆက်ထားလျှင်၊ ၎င်းသည် သင်၏ အဆက်အသွယ်များ နှင့် ခေါ်ဆိုမှု မှတ်တမ်းကို ရယူသုံးနိုင်မည်။"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"စက်များ တွဲချိတ်ရန်"</string>
-    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"တွေ့ရှိနေသောစက်များ"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"တွေ့ထားသောစက်များ"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"ကိရိယာများ မရှိ"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"ချိတ်ဆက်ရန်"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"ချိတ်ဆက်ခြင်းရပ်တန့်ရန်"</string>
@@ -513,7 +514,7 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"ရွေးချယ်စရာများ"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"အဆင့်မြင့်"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"အဆင့်မြင့် ဘလူးတုသ်"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ဘလူးတုသ်ကို ဖွင့်ထားလျှင်၊ သင်၏ ကိရိယာသည် အနီးရှိ အခြား ဘလူးတုသ် ကိရိယာမျာဖြင့် ဆက်သွယ်နိုင်သည်။"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ဘလူးတုသ်ကို ဖွင့်ထားလျှင်၊ သင်၏ ကိရိယာသည် အနီးရှိ အခြား ဘလူးတုသ် ကိရိယာများဖြင့် ဆက်သွယ်နိုင်သည်။"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ကိုချိတ်ဆက်ရန်"</string>
     <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"မီဒီယာ အသံ"</string>
     <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ဖုန်းအသံ"</string>
@@ -607,7 +608,7 @@
     <string name="wifi_starting" msgid="6732377932749942954">"ဝိုင်ဖိုင်ဖွင့်နေသည် …"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"ဝိုင်ဖိုင်ပိတ်နေသည် …"</string>
     <string name="wifi_error" msgid="3207971103917128179">"အမှား"</string>
-    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"လေယာဉ်ပျံပေါ်အသုံးပြုသောစနစ်"</string>
+    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"လေယာဉ်ပျံပေါ်သုံးစနစ်"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ကွန်ယက်များကို စကင်မလုပ်နိုင်ပါ"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"ကွန်ယက်မှအကြောင်းကြားချက်"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"အများပြည်သူ ကွန်ရက် ရနိုင်တိုင်းမှာ အကြောင်းကြားပေးရန်"</string>
@@ -664,7 +665,7 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"ကြိုုးမဲ့ ရောက်တာ လုံခြုံရေးဆက်တင် (TKIP) ကို အထောက်အကူမပြုပါ။"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"စစ်ဆေးမှုမအောင်မြင်ပါ။ ကျေးဇူးပြုပြီး နောက်ထပ်ကြိုးစားကြည့်ပါ"</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"အခြား WPS ကဏ္ဍကို တွေ့ရှိထားသည်။ ကျေးဇူးပြုပြီး နောက်မိနစ် အနည်းငယ်အတွင်း ထပ်ကြိုးစားပါ။"</string>
-    <string name="wifi_ssid" msgid="641393708309146745">"SSID နက်ဝဘ်"</string>
+    <string name="wifi_ssid" msgid="641393708309146745">"SSID ကွန်ရက်"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID ထည့်သွင်းရန်"</string>
     <string name="wifi_security" msgid="6603611185592956936">"လုံခြုံရေး"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"ထုတ်လွင့်မှုအား"</string>
@@ -703,9 +704,9 @@
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ကွန်ရက်ကို ချိတ်ဆက်ရန် မအောင်မြင်ခဲ့ပါ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"မေ့ပစ်ရန်"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ကွန်ရက် မေ့ပစ်ရန် မအောင်မြင်ခဲ့ပါ"</string>
-    <string name="wifi_save" msgid="3331121567988522826">"သိမ်းဆည်းရန်"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"သိမ်းပါ"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ကွန်ရက်ကို မှတ်သားရန် မအောင်မြင်ခဲ့ပါ"</string>
-    <string name="wifi_cancel" msgid="6763568902542968964">"ပယ်ဖျက်သည်"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"နေတော့"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"ကျော်ပါ"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"မကျော်ပါနှင့်"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"သတိပေးချက်: သင်က ကြိုးမဲ့ကို ကျော်သွားလျင်၊ သင်၏ တက်ဘလက်မှာ ကနဦး ဒေါင်းလုဒ်များ နှင့်  မွမ်းမံမှုများ အတွက် ဆယ်လူလာ ဒေတာကို သုံးမည် မဟုတ်ပါ။ ဒေတာ အတွက် ငွေတောင်းခံ လာနိုင်တာကို ရှောင်ရှားရန်၊ ကြိုးမဲ့သို့  ချိတ်ဆက်ပါ။"</string>
@@ -726,8 +727,8 @@
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"အိုင်ပီလိပ်စာ"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"သိမ်းထား ကွန်ရက်များ"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ဆက်တင်များ"</string>
-    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"သိမ်းဆည်းရန်"</string>
-    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"ပယ်ဖျက်သည်"</string>
+    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"သိမ်းပါ"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"နေတော့"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"ခိုင်လုံသော အိုင်ပီလိပ်စာကို ရိုက်ထည့်ပါ"</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"ခိုင်လုံသောဝင်ပေါက် (gateway)လိပ်စာကို ရိုက်ထည့်ပါ"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"ခိုင်လုံသော DNS လိပ်စာကို ရိုက်ထည့်ပါ"</string>
@@ -818,7 +819,7 @@
     <string name="search_settings" msgid="1910951467596035063">"ရှာဖွေခြင်း"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ရှာဖွေခြင်းဆက်တင်နှင့်ရာဇဝင်အား စီမံမည်"</string>
     <string name="display_settings" msgid="7965901687241669598">"ဖန်သားပြင်"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"မျက်နှာပြင်အား အလိုအလျောက်လှည့်ရန်"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"မျက်နှာပြင်ကို အော်တိုလှည့်"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"တက်ပလက်ကိုလှည့်သည့်အခါတွင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ဖုန်းကိုလှည့်သည့်အခါတွင် အနေအထားအား အလိုအလျောက်ပြောင်းရန်"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"တက်ပလက်ကိုလှည့်သည့်အခါတွင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်"</string>
@@ -826,8 +827,8 @@
     <string name="brightness" msgid="8480105032417444275">"တောက်ပမှု အဆင့်"</string>
     <string name="brightness_title" msgid="5746272622112982836">"တောက်ပမှု"</string>
     <string name="brightness_summary" msgid="838917350127550703">"စကရင်၏ အလင်းကိုချိန်ရန်"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"လိုက်ပြင်နိုင်သော တောက်ပမှု"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"ရှိသည့် အလင်းရောင် အတွက် တောက်ပမှု ဆီလျော်အောင် လုပ်ရန်"</string>
+    <string name="auto_brightness_title" msgid="6341042882350279391">"အလိုက်သင့် တောက်ပမှု"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"ရှိတဲ့ အလင်းရောင်ပေါ် မှုတည်ပြီး တောက်ပမှု ချိန်ညှိမယ်"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"နားခြင်း"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"မျက်နှာပြင်များကို ပိတ်ထား"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>နောက်ပိုင်း လှုပ်ရှားမှုမရှိခြင်း"</string>
@@ -871,7 +872,7 @@
     <string name="sim_change_succeeded" msgid="8556135413096489627">"ဆင်းကဒ် ပင်နံပါတ် ပြောင်းခြင်းအောင်မြင်ပါသည်"</string>
     <string name="sim_lock_failed" msgid="5651596916127873626">"ဆင်းမ်ကဒ်သော့ကျနေမှုအခြေအနေအား ပြောင်းမရပါ။ \nပင်နံပါတ်မှားယွင်းမှု ဖြစ်နိုင်သည်။"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ကောင်းပြီ"</string>
-    <string name="sim_enter_cancel" msgid="6240422158517208036">"ပယ်ဖျက်သည်"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"နေတော့"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"ဆင်းမ်များ အများအပြား တွေ့ထား"</string>
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"ဆယ်လူလာ ဒေတာ အတွက် သင် ပိုနှစ်သက်သည့် ဆင်းမ်ကို ရွေးရန်"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ဆင်းမ်ကဒ်၏ လျှို့ဝှက်နံပါတ် မှားနေပါသည်၊ သင်၏ စက်ပစ္စည်းကို သော့ဖွင့်ရန် ဖုန်းလိုင်းဌာနသို့ ဆက်သွယ်ရမည် ဖြစ်ပါတယ်"</string>
@@ -920,20 +921,20 @@
     <string name="status_unavailable" msgid="7862009036663793314">"မရရှိနိုင်ပါ။"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ဖွင့်ထားသောအချိန်"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ပြန်ပွင့်မည်အချိန်"</string>
-    <string name="internal_memory" msgid="9129595691484260784">"စက်အတွင်းသိမ်းဆည်းရန်နေရာ"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"စက်တွင်း သိုလှောင်ထားမှု"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USBဖြင့် သိမ်းဆည်းခြင်း"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD ကဒ်"</string>
-    <string name="memory_available" msgid="5052397223077021181">"ရရှိနိုင်သည်"</string>
+    <string name="memory_available" msgid="5052397223077021181">"နေရာလွတ်"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"အသုံးပြုနိုင်သည် (ဖတ်ရန်သပ်သပ်)"</string>
-    <string name="memory_size" msgid="6629067715017232195">"နေရာအကျယ်စုစုပေါင်း"</string>
+    <string name="memory_size" msgid="6629067715017232195">"စုစုပေါင်း မမ်မိုရီနေရာ"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"တွက်ချက်နေသည်"</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"အပလီကေးရှင်းများ(အပလီကေးရှင်းဒေတာ &amp; မီဒီယာမာတိကာ)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"မီဒီယာ"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"ဒေါင်းလုပ်များ"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"ဓါတ်ပုံနှင့်ဗွီဒီယိုများ"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"အသံ(ဂီတ၊ ဖုန်းမြည်သံ၊ podcasts စသည်)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"အသံ (သီချင်း၊ တီးလုံး စသည်ဖြင့်)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"အသေးအဖွဲများ"</string>
-    <string name="memory_media_cache_usage" msgid="6704293333141177910">"မှတ်သားထားသောအချက်အလက်များ"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"မှတ်သိမ်းထားသော ဒေတာ"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"မျှဝေသုံးသောသိုလှောင်မှုအား အထိုင်မှဖြုတ်ခြင်း"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SDကဒ်အားအထိုင်မှဖြုတ်ခြင်း"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"စက်အတွင်းUSBသိုလှောင်မှုအား အထိုင်မှဖြုတ်ခြင်း"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"စနစ်အားရှင်းလင်းခြင်းဝန်ဆောင်မှုမရှိသောကြောင့် အစမှပြန်လည်စတင်နိုင်ခြင်းအားမပြုလုပ်နိုင်ပါ"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ပြန်လည်စတင်ရန် ပြုလုပ်မလား?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ဤအသုံးပြုသူအတွက် စက်ရုံပြန်လည် သတ်မှတ်မှု မရပါ"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"ဖျက်နေသည်"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"ခဏစောင့်ပါ..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USBသိုလှောင်မှုဖျက်ခြင်း"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SDကတ်အား ဖျက်ရန်"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USBသိုလှောင်မှုအားလုံးဖျက်မည်"</string>
@@ -1065,7 +1064,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ရွေ့လျားနိုင်သောဟော့စပေါ့"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ဘလူးတုသ်တဆင့်ပြန်ချိတ်ဆက်"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"တဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"တဆင့်ချိတ်ဆက်၊ဟော့စပါ့"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"တဆင့်ချိတ်ဆက်ခြင်း၊ ဟော့စပေါ့"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USBမှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB ချိတ်ဆက်ထားပြီး၊ တဆင့်လွှင့်နိုင်ရန် စစ်ဆေးပါ"</string>
@@ -1090,7 +1089,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"အကူအညီ"</string>
     <string name="network_settings_title" msgid="4871233236744292831">"ဆယ်လူလာ ကွန်ရက်များ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"မိုဘိုင်းလ်အစီအစဉ်"</string>
-    <string name="sms_application_title" msgid="6134351177937015839">"မူရင်းစာတိုပို့ရန် အပလီကေးရှင်း"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"စာတိုပို့ရန်သုံး အပလီကေးရှင်း"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"စာတိုပို့ရန် အပလီကေးရှင်းပြောင်းမည်လား?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"သင့်စာတိုပို့ရန် အပလီကေးရှင်းအတွက် <xliff:g id="NEW_APP">%1$s</xliff:g> ကို <xliff:g id="CURRENT_APP">%2$s</xliff:g> အစား သုံးမည်လား?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> ကို သင်၏စာတိုပို့ရန် အပလီကေးရှင်းအဖြစ် သုံးမည်လား ?"</string>
@@ -1139,7 +1138,11 @@
     <string name="copyright_title" msgid="865906688917260647">"မူပိုင်ခွင့်"</string>
     <string name="license_title" msgid="1990487604356037871">"လိုင်စင်"</string>
     <string name="terms_title" msgid="7697580845616764642">"သတ်မှတ်ချက်များနှင့် အခြေအနေများ"</string>
-    <string name="settings_license_activity_title" msgid="7553683406244228650">"ရင်းမြစ်လိုင်စင်များအားဖွင့်ရန်"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
+    <string name="settings_license_activity_title" msgid="7553683406244228650">"အိုးပင်းဆော့လိုင်စင်များအားဖွင့်ရန်"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"လိုင်စင်များကို ဖတ်တင်ရန် ပြသနာရှိနေပါသည်"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ဖွင့်နေစဉ်"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"လုံခြုံမှုဆိုင်ရာအချက်အလက်များ"</string>
@@ -1200,7 +1203,7 @@
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"သင့်ဖုန်းနှင့် ကိုယ်ပိုင်အချက်အလက်များအား မသိရှိသောအပ်ပလီကေးရှင်းများ၏ တိုက်ခိုက်ခြင်းကိုပိုပြီးခုခံနိုင်စွမ်းမရှိပါ။  ဤအပ်ပလီကေးရှင်းများကြောင့် သင့်ဖုန်းပျက်စီးခြင်း သို့မဟုတ် ဒေတာဆုံးရှုံးခြင်းစသည့်ဆုံးရှုံးမှုရလဒ်များကို တာဝန်ယူရန် သင်သဘောတူသည်ဖြစ်သည်။"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"အဆင့်မြင့်အပြင်အဆင်များ"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"ပိုမိုပြီးရွေးချယ်နိုင်သော အပြင်အဆင်များ ရရှိခြင်း"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"အပ်ပလီကေးရှင်း အချက်အလက်များ"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"အက်ပ် အချက်အလက်များ"</string>
     <string name="storage_label" msgid="8700867073480107253">"သိုလှောင်မှုများ"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"မူရင်းအတိုင်း ဖွင့်ရန်"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"မူရင်းအတိုင်း"</string>
@@ -1252,14 +1255,14 @@
     <string name="disabled" msgid="9206776641295849915">"ပိတ်ထားပြီး"</string>
     <string name="not_installed" msgid="1475144352069281880">"မထည့်သွင်းထားပါ"</string>
     <string name="no_applications" msgid="7336588977497084921">"အပ်ပလီကေးရှင်းများမရှိပါ"</string>
-    <string name="internal_storage" msgid="1584700623164275282">"စက်အတွင်းသိမ်းဆည်းရန်နေရာ"</string>
+    <string name="internal_storage" msgid="1584700623164275282">"စက်တွင်း သိုလှောင်ထားမှု"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USBသိုလှောင်မှု"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SDကဒ်သိုလှောင်မှုများ"</string>
     <string name="recompute_size" msgid="7722567982831691718">"အရွယ်အစားကို ပြန်လည်တွက်ချက်နေသည်"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"အပ်ပလီကေးရှင်းဒေတာအား ပယ်ဖျက်မည်လား?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"ဤအပလီကေးရှင်၏ဒေတာများအားလုံးကို ထာဝရဖျက်ပါမည်။ ဖိုင်များအားလုံး၊ ဆက်တင်များ၊ အကောင့်များ၊ ဒေတာဘေ့စ်စသည်တို့ပါဝင်ပါမည်။"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"ကောင်းပြီ"</string>
-    <string name="dlg_cancel" msgid="1674753358972975911">"ပယ်ဖျက်သည်"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"နေတော့"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="8333723538280257243">"ထည့်သွင်းထားသော အပ်ပလီကေးရှင်းထဲတွင် ဤအပ်ပလီကေးရှင်းအား မတွေ့ရှိပါ"</string>
     <string name="clear_data_failed" msgid="1907582169616856698">"အပ်ပလီကေးရှင်းဒေတာအား မရှင်းလင်းနိုင်ပါ"</string>
@@ -1365,14 +1368,14 @@
     <string name="auto_punctuate" msgid="4595367243950425833">"ပုဒ်ဖြတ် ပုဒ်မ အလိုအလျောက်ပြင်ခြင်း"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"ခလုတ်ပါဝင်သောကီးဘုတ်ဆက်တင်များ"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Space key အားနှစ်ခါနှိပ်ပါက  \".\" အား ထည့်မည်"</string>
-    <string name="show_password" msgid="3001113966880559611">"စကားဝှက်များကိုမြင်သာအောင်ပြုလုပ်ခြင်း"</string>
+    <string name="show_password" msgid="3001113966880559611">"စကားဝှက်များ မြင်သာစေခြင်း"</string>
     <string name="ime_security_warning" msgid="4135828934735934248">"ဤထည့်သွင်းမှုနည်းလမ်းမှာ သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ကရက်ဒစ်ကဒ်နံပါတ်စသည်တို့ကို ရယူသွားမည်ဖြစ်သည်။ <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>အပလီကေးရှင်းမှလာပါသည်။ ဤထည့်သွင်းမှုနည်းလမ်းကို အသုံးပြုမည်လား?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"ဤစာလုံးပေါင်းစစ်ဆေးရာတွင် သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ကရက်ဒစ်ကဒ်နံပါတ်စသည်တို့အပါအဝင် သင်ရိုက်ထည့်သောစာများအားလုံးကို ရယူသွားမည်ဖြစ်သည်။ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>ဤစာလုံးပေါင်းစစ်ဆေးခြင်းကို အသုံးပြုမည်လား?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"ဆက်တင်များ"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"ဘာသာစကား"</string>
     <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>အတွက် ဆက်တင်းများဖွင့်ရန် မအောင်မြင်ပါ။"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"ကြွက်/trackpad"</string>
-    <string name="pointer_speed" msgid="1221342330217861616">"မြားအမြန်နှုန်း"</string>
+    <string name="pointer_settings_category" msgid="8183819795164034286">"မောက်စ်နှင့် တို့ရွှေ့ပြင်"</string>
+    <string name="pointer_speed" msgid="1221342330217861616">"မြားရွေ့နှုန်း"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"ဂိမ်းထိန်းချုပ်ခြင်း"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"တုန်ခါစက်ကိုသုံးရန်"</string>
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"ချိတ်ဆက်ပြီးသောအခါ တုန်ခါခြင်းကို ဂိမ်းထိန်းချုပ်ရာဆီသို့ လမ်းလွှဲရန်"</string>
@@ -1412,7 +1415,7 @@
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"ရှင်းလင်းရန်"</string>
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>)အတွက်သင့်အတိုကောက်ကို ပယ်ဖျက်ပါမည်"</string>
     <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"ကောင်းပြီ"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"ပယ်ဖျက်သည်"</string>
+    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"နေတော့"</string>
     <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>
@@ -1497,29 +1500,29 @@
     <string name="app_name_label" msgid="5440362857006046193">"အပ်ပလီကေးရှင်း"</string>
     <string name="last_time_used_label" msgid="8459441968795479307">"နောက်ဆုံး အကြိမ် အသုံးပြုခဲ့"</string>
     <string name="usage_time_label" msgid="295954901452833058">"အသုံးပြုအချိန်"</string>
-    <string name="accessibility_settings" msgid="3975902491934816215">"လွယ်ကူစွာ သုံးစွဲနိုင်မှု"</string>
-    <string name="accessibility_settings_title" msgid="2130492524656204459">"လွယ်ကူစွာ သုံးစွဲနိုင်မှု၏ ဆက်တင်များ"</string>
-    <string name="accessibility_services_title" msgid="2592221829284342237">"ဆားဗစ်များ"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"အများ သုံးစွဲနိုင်မှု"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"အများ သုံးစွဲနိုင်မှု ဆက်တင်များ"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"ဆားဗစ်ဆိုင်ရာ"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"စနစ်"</string>
-    <string name="accessibility_display_title" msgid="7610175687949675162">"ပြသခြင်း"</string>
-    <string name="accessibility_captioning_title" msgid="7589266662024836291">"စာတန်းများ"</string>
-    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"အမူအရာများကို အကျယ်ချဲ့ရန်"</string>
+    <string name="accessibility_display_title" msgid="7610175687949675162">"အမြင်ပိုင်း"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"စာတန်း"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"ထိနှိပ်ဟန်ပန်သုံး အကျယ်ချဲ့ရန်"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"ဤအစီအစဉ်ကို စလိုက်လျှင် သင်သည် မျက်နှာပြင်ကို ၃ချက်တို့ထိခြင်းဖြင့် မြင်ကွင်း အချုံ့အချဲ့ ပြုလုပ်နိုင်သည်။ \n\n ချဲ့ကြည့်လိုက်သောအခါ သင်သည် \n"<ul><li>"Pan: လက်နှစ်ချောင်း သို့ ပိုများသောလက်ချောင်းများဖြင့် မျက်နှာပြင် တလျှောက် ဖိဆွဲပါ။"</li>\n<li>"ချုံ့ချဲ့အဆင့်များ ကိုက်ညှိခြင်း၊ လက်နှစ်ချောင်း သို့ လက်ချောင်းများ အတူတကွသုံး၍ ချုံ့ချဲ့ပါ သို့ ၎င်းတို့ကို ခြားထားပြီး ဖြန့်လိုက်ပါ။ "</li></ul>\n\n"သင့်လက်ချောင်းအောက်၌ ရှိသည့်အရာအား ၃ချက်တို့ထိပြီး ဖိထားခြင်းဖြင့် ယာယီအကြီးချဲ့နိုင်သည်။  ဤအကြီးချဲ့ထားစဉ်တွင် မျက်နှာပြင်ပေါ်မှ အခြားနေရာများသို့ သင့်လက်ချောင်းဖြင့် ဆွဲယူပြီး ရှာဖွေကြည့်နိုင်သည်။  မူလအခြေအနေ ပြန်ရောက်စေရန် လက်ချောင်းကို ပြန်မလိုက်ပါ။ \n\nမှတ်ချက်၊ အကြီးချဲ့ရန် ၃ချက်တို့ထိခြင်းသည် လက်ကွက်နှင့် ရွေ့လျားမျဉ်းတန်းမှလွဲ၍ နေရာတိုင်းတွင် ပြုလုပ်နိုင်သည်။"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"လွယ်ကူစွာ ရရှိနိုင်မှု စွမ်းရည်ပေးသော ရှော့ကပ်"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"အများသုံးစွဲနိုင်မှု ရှော့ကပ်"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"ပွင့်"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"ပိတ်"</string>
     <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"ဤအစီအစဉ်ကို စလိုက်လျှင် သင်သည် နားလည်ရန်လွယ်ကူအောင် အထောက်ကူပြုသည့် အစီအစဉ်များကို အဆင့် ၂ဆင့်ဖြင့် လျှင်မြန်စွာ ဖွင့်နိုင်သည်။ \n\nအဆင့် (၁)၊ အဖွင့်ပိတ်ခလုတ်ကို နှိပ်ပြီး အသံတခု ကြားရသည်အထိ သို့ တုန်ခါသည်အထိဖိထားပါ။\n\nအဆင့် (၂)၊ အသံဖြင့် ထောက်ခံချက်ကြားသည်အထိ လက်နှစ်ချောင်းဖြင့် တို့ထိ၍ ဖိထားပါ။ \n\n အကယ်၍ စက်၌ သုံးစွဲသူအများအပြားရှိပါက စက်ပစ္စည်းသော့ဖွင့်သည်အထိ ဤ အတိုကောက်ကို သော့ချထားသော မျက်နှာပြင်ပေါ် သုံး၍ နားလည်ရန်လွယ်ကူအောင် အထောက်အကူပြုမှုကို ယာယီဖွင့်နိုင်သည်။"</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"စာလုံးအကြီးစား"</string>
-    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"ဖြူမဲခြားနားချက် မြင့် စာသား"</string>
+    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"အရောင်ခြားနားချက်မြင့် စာသား"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"မျက်နှာပြင်ချဲ့မှု"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"မျက်နှာပြင်ချဲ့မှု အော်တိုမြှင့်ရန်"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"appအကူးပြောင်းတွင်မျက်နှာပြင်ချဲ့မှုအဆင့်မြှင့်ရန်"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ဖွင့်ပိတ်ခလုတ်ဖြင့်ခေါ်ဆိုမှုရပ်ရန်"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ဖွင့်ပိတ်ခလုတ်နှိပ်လျှင် ဖုန်းပြောရပ်ရန်"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"စကားဝှက်အားပြောပါ"</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"ထိပြီး &amp; ဆွဲနှိပ်ထားပါ"</string>
-    <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"အရောင်​ပြောင်းပြန်လှန်ခြင်း"</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="8658240868230680912">"(စမ်းသပ်မှု) လုပ်ကိုင်မှုကို အကျိုးသက်ရောက်နိုင်"</string>
-    <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"အရောင် ပြင်မှု"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"ထိနှိပ်မှုနှင့် ဖိနှိပ်မှုကွာချိန်"</string>
+    <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"အရောင်​ပြောင်းပြန်"</string>
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="8658240868230680912">"(စမ်းသပ်ဆဲ) စွမ်းဆောင်ရည် ကျစေနိုင်သည်"</string>
+    <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"အရောင်ပြင်ဆင်မှု"</string>
     <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ဒီအင်္ဂါရပ်မှာ စမ်းသပ်မှု ဖြစ်၍ လုပ်ကိုင်မှုကို အကျိုးသက်ရောက်နိုင်သည်။"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"အမြန်ဆက်တင်များတွင်ပြပါ"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"အမှန်ပြင်သည့်နည်းလမ်း"</string>
@@ -1572,24 +1575,24 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"မည်သည့်အကြောင်းအရာမှမရှိပါ"</string>
     <string name="settings_button" msgid="3006713718908152930">"ဆက်တင်များ"</string>
     <string name="print_settings" msgid="4742428530112487843">"ပရင့်ထုတ်‌ခြင်း"</string>
-    <string name="print_settings_title" msgid="3685449667822217816">"စာထုတ်သောဆားဗစ်များ"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"ပရင့်ထုတ် ဆားဗစ်များ"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> ကိုအသုံးပြုမည်လား ?"</string>
     <string name="print_service_security_warning_summary" msgid="7567131958613064363">"သင့် စာရွက်စာတမ်းများသည် စာထုတ်စက်သို့ သွားရာတွင် တစ်ခုသို့ ထို့ထက်ပိုသော ဆာဗာများကို ဖြတ်သန်းရမည်။"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"မည်သည့်ဆားဗစ်မှမရှိပါ"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"စာထုတ်စက် တစ်ခုမှ မတွေ့ရှိပါ"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ဆက်တင်များ"</string>
-    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"စာထုတ်စက်များထည့်ရန်"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"ပရင်တာများထည့်ရန်"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"ပွင့်"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"ပိတ်"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"ဆားဗစ် အသစ်ထည့်ရန်"</string>
-    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"စာထုတ်စက်ကို ထည့်ပါ"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"ပရင်တာ ထည့်ရန်"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"ရှာဖွေခြင်း"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"စာထုတ်စက်များကို ရှာနေပါသည်"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"ဆားဗစ်များ အသုံးမပြုနိုင်အောင် ပိတ်ထားသည်"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"စာထုတ်အလုပ်များ"</string>
     <string name="print_print_job" msgid="7563741676053287211">"စာထုတ်အလုပ်"</string>
     <string name="print_restart" msgid="8373999687329384202">"အစက ပြန်စရန်"</string>
-    <string name="print_cancel" msgid="3621199386568672235">"ပယ်ဖျက်သည်"</string>
+    <string name="print_cancel" msgid="3621199386568672235">"နေတော့"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ကို စာထုတ်နေပါသည်"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ကို ပယ်ဖျက်နေပါသည်"</string>
@@ -1662,7 +1665,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"တွက်ချက်ထားသည့် ပါဝါ သုံးစွဲမှု"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"တွေ့မြင်ရသည့် ပါဝါ သုံးစွဲမှု"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"မဖြစ်မနေ ရပ်ခိုင်းခြင်း"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"အပ်ပလီကေး အချက်အလက်များ"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"အက်ပ်အချက်အလက်များ"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"အပလီကေးရှင်းဆက်တင်များ"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"မျက်နှာပြင်ဆက်တင်များ"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"ဝိုင်ဖိုင်ဆက်တင်များ"</string>
@@ -1735,15 +1738,15 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"အသံ ထည့်သွင်းခြင်းနှင့် ထုတ်လွှင့်ခြင်းဆက်တင်များ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"အသံဖြင့် ရှာဖွေခြင်း"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Androidလက်ကွက်"</string>
-    <string name="voice_category" msgid="1430370497125803904">"စကားပြောခြင်း"</string>
+    <string name="voice_category" msgid="1430370497125803904">"စကားပြော"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"အသံဖြင့် ထည့်သွင်းရေး ဆက်တင်များ"</string>
-    <string name="voice_input_settings_title" msgid="2676028028084981891">"အသံဖြင့် ထည့်သွင်းမှု"</string>
+    <string name="voice_input_settings_title" msgid="2676028028084981891">"အသံဖြင့် စာရိုက်ထည့်ခြင်း"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"အသံဖြင့် ထည့်သွင်းရေး ဝန်ဆောင်မှုများ"</string>
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"စကားလုံးတို နှင့် ပြန်လှန်တုံ့ပြန်မှု အပြည့်"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"ရိုးရိုး စကားမှ စာသားသို့"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ဒီအသံဖြင့် ရိုက်သွင်းရေး ဝန်ဆောင်မှုက သင့်ကိုယ်စား အမြဲတမ်း အသံကို စောင့်ကြပ်ပေးလျက် အသံကို ဖွင့်ပေးထားသည့် အပလီကေးရှင်းများကို ထိန်းချုပ်ပေးသည်။ ၎င်းကို <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> အပလီကေးရှင်းက ဆောင်ရွက်ပေးသည်။ ဒီဝန်ဆောင်မှု သုံးရန်ကို ဖွင့်ပေးရမလား?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"စာတမ်းမှ စကားပြောဆိုခြင်းထံ၏ ဆက်တင်များ"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"စကားပြော စာရိုက်ခြင်းမှ ထွက်ပေါ်မှု"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"စာသားမှစကားပြောပြောင်း ဆက်တင်များ"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"စာသားမှ အသံထွက်စေခြင်း"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ကျွန်ုပ်၏အပြင်အဆင်များကို အမြဲသုံးရန်"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"အောက်ပါမူရင်းဆက်တင်များမှာ အပလီကေးရှင်းဆက်တင်များကို ပယ်ဖျက်မည်"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"မူရင်းအပြင်အဆင်များ"</string>
@@ -1769,10 +1772,10 @@
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"ဤစကားသံပေါင်းစပ်အင်ဂျင်အားအသုံးပြုရာရာတွင် သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ကရက်ဒစ်ကဒ်နံပါတ်စသည်တို့အပါအဝင် သင်ပြောဆိုသောစာသားများအားလုံးကို ရယူသွားမည်ဖြစ်သည်။ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>အင်ဂျင်မှ လာပါသည်။ ဤစကားသံပေါင်းစပ်အင်ဂျင်ကို အသုံးပြုမည်လား?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"ဤဘာသာစကားသည် စာသားမှ အသံထွက်ရန် အလုပ်လုပ်သော ကွန်ရက်ချိတ်ဆက်မှု လိုအပ်သည်။"</string>
     <string name="tts_default_sample_string" msgid="4040835213373086322">"ဤသည်မှာ အသံတုလုပ်ခြင်း ၏ နမူနာတစ်ခုဖြစ်သည်။"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"ပုံသေဘာသာစကားအခြေအနေပြ"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"လက်ရှိဘာသာစကားအခြေအနေ"</string>
     <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> သည်အပြည့်အ၀ အထောက်အကူပြုသည်။"</string>
     <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g>သည် ကွန်ရက်ဆက်သွယ်မှုလိုအပ်သည်"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> သည်အထောက်အကူမပြုပါ။"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> အတွက် မရသေးပါ"</string>
     <string name="tts_status_checking" msgid="4983413982985913047">"စစ်ဆေးနေသည် ..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"အင်ဂျင်များ"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>ဆက်တင်များ"</string>
@@ -1785,10 +1788,10 @@
     <string name="pico_not_installed" msgid="6266845418419994311">"မထည့်သွင်းထားပါ"</string>
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"အမျိုးသမီး"</string>
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"အမျိုးသား"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"စကားပြောဆိုခြင်းအင်ဂျင်အား ထည့်သွင်းပြီး"</string>
+    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"စကားပြော နားလည်ရေးအင်ဂျင် ထည့်သွင်းပြီး"</string>
     <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"အသုံးမပြုမီ အင်ဂျင်အသစ်ကို ဖွင့်ပါ"</string>
     <string name="tts_engine_settings_button" msgid="1030512042040722285">"အင်ဂျင်ဆက်တင်များကိုဖွင့်ခြင်း"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"လိုလားသော အင်ဂျင်"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"ဦးစားပေးအင်ဂျင်"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"ယေဘုယျ"</string>
     <string name="gadget_title" msgid="5519037532720577836">"ဖွင့်ပိတ်ထိန်းချုပ်မှု"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"ဝိုင်ဖိုင်ဆက်တင်းများကို နောက်ဆုံးအခြေရောက်အောင်လုပ်သည်"</string>
@@ -1841,16 +1844,16 @@
     <string name="allow_usage_access_message" msgid="2295847177051307496">"သင် သုံးခွင့်ပြုပါက၊ သင့်စက်ကိရိယာပေါ်ရှိ app များကို သင်အကြိမ်မည်မျှအသုံးပြုကြောင်း အစရှိသည့် အထွေထွေအချက်အလက်များကို ဤapp က မြင်နိုင်သည်။"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"အရေးပေါ်ခေါ်ဆိုမှုအတွက် မြည်သံ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"အရေးပေါ်ခေါ်ဆိုမှုအတွက် လုပ်ဆောင်ပုံကို သတ်မှတ်ရန်"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"အရန်သိမ်းဆည်ရန်နှင့် ပြန်လည်စတင်စေရန်"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"အရန်သိမ်းဆည်ရန်နှင့် ပြန်လည်စတင်စေရန်"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"အရန်သိမ်းခြင်းနှင့် ပြန်စခြင်း"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"အရန်သိမ်းခြင်းနှင့် ပြန်စခြင်း"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"အရန်ပြုလုပ်ခြင်းနှင့် ပြန်လည်ရယူခြင်း"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ကိုယ်ရေးအချက်အလက်"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"ကျွန်ုပ်ဒေတာများကို အရန်ထားခြင်း"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"အရန်အဖြစ်သိမ်းထားသော အပလီကေးရှင်း၏ အချက်အလက်၊ ဝိုင်ဖိုင်စကားဝှက်များနှင့်  ဂူဂယ်လ်ဆာဗာများသို့ အခြားဆက်တင်များ"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"အရန်သိမ်းဆည်းရန်အကောင့်"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"အက်ပ်ဒေတာ၊ ဝိုင်ဖိုင်စကားဝှက်များနှင့် အခြားဆက်တင်များကို ဂူဂယ်လ်ဆာဗာများတွင် အရန်သိမ်းထားပါ"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"အရန်သိမ်း အကောင့်"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"လက်ရှိ မည်သည့်အကောင့်မှ ဒေတာကို အရန်သိုလှောင်ခြင်းမပြုလုပ်နေပါ။"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"app ဒေတာကို ထည့်သွင်းရန်"</string>
-    <string name="auto_restore_title" msgid="5397528966329126506">"အလိုအလျောက် ပြန်လည်ရယူမည်။"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"အလိုအလျောက် ပြန်လည်ရယူမည်"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"အပလီကေးရှင်းကို ပြန်လည်ထုတ်လျှင် အရန်ပြုလုပ်ထားသောဆက်တင်များနှင့် ဒေတာများကို ပြန်လည်ရယူရန်ပြုလုပ်မည်။"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop အရန်စကားဝှက်"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"အလုပ်ခုံတွင် အရန်သိမ်းဆည်းခြင်းများကို လောလောဆယ် မကာကွယ်နိုင်ပါ။"</string>
@@ -1895,8 +1898,8 @@
     <string name="wifi_setup_detail" msgid="2336990478140503605">"ကွန်ယက်၏အသေးစိတ်"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"ချိတ်ဆက်ရန်"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"မေ့ပစ်ရန်"</string>
-    <string name="wifi_setup_save" msgid="3659235094218508211">"သိမ်းဆည်းရန်"</string>
-    <string name="wifi_setup_cancel" msgid="3185216020264410239">"ပယ်ဖျက်သည်"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"သိမ်းပါ"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"နေတော့"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"ကွန်ယက်များကိုစကင်ပြုလုပ်နေသည်"</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"ဆက်သွယ်လိုသောကွန်ယက်ကို ထိပါ"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"လက်ရှိကွန်ယက်အား ဆက်သွယ်မည်"</string>
@@ -1930,8 +1933,8 @@
     <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="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">
@@ -2131,12 +2134,12 @@
     <string name="vpn_routes" msgid="3818655448226312232">"တဆင့်ပို့လမ်းကြောင်းများ(ဥပမာ10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"သုံးစွဲသူ အမှတ်"</string>
     <string name="vpn_password" msgid="6756043647233596772">"စကားဝှက်"</string>
-    <string name="vpn_save_login" msgid="6350322456427484881">"အကောင့်အချက်အလက်များကို သိမ်းဆည်းရန်"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"အကောင့်အချက်အလက်များကို သိမ်းပါ"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(မသုံးမပြု)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ဆာဗာကိုအတည်မပြုပါနှင့်)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(ဆာဗာမှ ရရှိထားသည်)"</string>
-    <string name="vpn_cancel" msgid="1979937976123659332">"ပယ်ဖျက်သည်"</string>
-    <string name="vpn_save" msgid="4233484051644764510">"သိမ်းဆည်းရန်"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"နေတော့"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"သိမ်းပါ"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"ချိတ်ဆက်ရန်"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"VPNကိုယ်ရေးအချက်အလက်ကို ပြင်ဆင်ရန်"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> နှင့် ချိတ်ဆက်ခြင်း"</string>
@@ -2163,7 +2166,7 @@
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"အရန်သိမ်းဆည်းရန်အတွက် ဤနေရာတွင်စကားဝှက်အသစ်ကို ရိုက်ထည့်ပါ"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"သင့်အပိုဆောင်းစကားဝှက်အပြည့်အား ပြန်လည်ပြီး ထည့်ပါ။"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"အရန်သိမ်းဆည်းခြင်းအတွက် စကားဝှက်သတ်မှတ်ရန်"</string>
-    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ပယ်ဖျက်သည်"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"နေတော့"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ဖြည့်စွက် စနစ်တိုးမြင့်မှုများ"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"သုံးမရအောင် ပိတ်ထားခြင်း"</string>
@@ -2242,7 +2245,7 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ဤဆက်တင်းသည် ဤဖုန်းမှ သူံးစွဲသူအားလုံးကို အကျိုးသက်ရောက်လိမ့်မည်။"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ဘာသာစကားပြောင်းရန်"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"စာလုံးအရွယ်အစားပြောင်းရန်"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"တို့ထိ၍ပေးသောစနစ်"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"တို့ထ‌ိပေးစနစ်"</string>
     <string name="google_wallet" msgid="9122936252378589227">"Google ပိုက်ဆံအိတ်"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"တစ်ချက်တို့ထိရုံဖြင့် ပေးရန်"</string>
     <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"ရှေ့ပိုင်းရှိ appကို ပိုကြိုက်"</string>
@@ -2271,7 +2274,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"ခေါ်ဆိုမှု မန်နေဂျာ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"အရေး ထုတ်လွှင့်မှုများ"</string>
+    <string name="cell_broadcast_settings" msgid="2451014351355183338">"အရေးပေါ် ထုတ်လွှင့်မှုများ"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ကွန်ယက် အော်ပရေတာများ"</string>
     <string name="access_point_names" msgid="1381602020438634481">"ချိတ်ဆက် နေရာ အမည်များ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"မြှင့်တင်ထား 4G LTE မုဒ်"</string>
@@ -2311,7 +2314,7 @@
     <string name="sim_calls_always_use" msgid="7936774751250119715">"ခေါ်ဆိုမှုများ အတွက် အမြဲတမ်း ဒါကို သုံးရန်"</string>
     <string name="sim_select_card" msgid="211285163525563293">"ဆင်းမ် ကဒ်ကို ရွေးရန်"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"ဆင်းမ် <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
-    <string name="sim_slot_empty" msgid="8964505511911854688">"SIM ပလာဖြစ်နေ"</string>
+    <string name="sim_slot_empty" msgid="8964505511911854688">"ဆင်းမ်ကဒ် မရှိ"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"ဆင်းမ် အမည်"</string>
     <string name="sim_editor_title" msgid="6364331907415443358">"ဆင်းမ် ကဒ်"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"စီမံပေးသူ"</string>
@@ -2331,8 +2334,8 @@
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"ကွန်ရက် အမည် ထုတ်လွှင့်မှု ပိတ်ထားမှု"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"ကွန်ရက် အမည် ထုတ်လွှင့်မှု ပိတ်ထားမှုက သင်၏ ကွန်ရက် အချက်အလက်များကို အခြားသူတို့မှ ရယူများမှ ကာကွယ်ပေးသည်။"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"ကွန်ရက် အမည် ထုတ်လွှင့်မှု ပိတ်ထားမှုက ဝှက်ထားသည့် ကွန်ရက်များသို့ အလိုအလျောက် ချိတ်ဆက်မှုကို ဟန့်တားပေးမည်။"</string>
-    <string name="sim_pref_divider" msgid="4194064766764348209">"လှုပ်ရှားမှုများ"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="2897913529999035350">"အစမှာ မေးရန်"</string>
+    <string name="sim_pref_divider" msgid="4194064766764348209">"လုပ်ငန်းဆောင်တာ"</string>
+    <string name="sim_calls_ask_first_prefs_title" msgid="2897913529999035350">"အရင်မေးပါ"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ရွေးချယ်ရန် လိုအပ်"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ဆက်တင်များ"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ဆက်တင်များ"</string>
@@ -2375,34 +2378,34 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"NFC တဲဂ် သို့  ဒေတာကို ရေးထည့် မရခဲ့ပါ။ ပြဿနာ ဆက်ရှိနေလျှင်၊ အခြား တဲဂ် တစ်ခုကို စမ်းကြည့်ပါ"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC တဲဂ်မှာ ရေးမရနိုင်ပါ။ ကျေးဇူးပြုပြီး အခြား တဲဂ် တစ်ခုကို စမ်းကြည့်ပါ။"</string>
     <string name="default_sound" msgid="8821684447333687810">"ပုံသေ အသံ"</string>
-    <string name="notification_settings" msgid="8791730980212496561">"အသံ &amp; အကြောင်းကြားချက်"</string>
+    <string name="notification_settings" msgid="8791730980212496561">"အသံနှင့် အကြောင်းကြားချက်"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"မီဒီယာ ပမာဏ"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"နှိုးစက် အသံ ပမာဏ"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"ဖုန်းမြည်သံ ပမာဏ"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"အကြောင်းကြားချက်သံ ပမာဏ"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"ကြားဖြတ်ဝင်မှုများ"</string>
+    <string name="zen_mode_settings_title" msgid="7014915558669122902">"ကြားဖြတ်ဖုန်းဝင်မှု"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"ခေါ်ဆိုမှုများ နှင့် အကြောင်းကြားချက်များ ဝင်လာလျှင်"</string>
     <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"အကြောင်းကြားချက်များ  ဝင်လာလျှင်"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"အမြဲတမ်း ကြားဖြတ်ဝင်ရန်"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ဦးစားပေး ကြားဖြတ်ဝင်မှုများကိုသာ ခွင့်ပြုရန်"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ကြားဖြတ် မဝင်ပါနှင့်"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"ဖုန်း၏ မြည်သံအမျိုးအစား"</string>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"အကြောင်းကြားချက် ပုံသေ သံစဉ်"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ခေါ်ဆိုမှု အတွက်ပါ တုန်ခါရန်"</string>
+    <string name="zen_mode_option_off" msgid="3167702608910820883">"အမြဲတမ်း ကြားဖြတ်ဖုန်းဝင်ခွင့်ပေးရန်"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ဦးစားပေး ကြားဖြတ်ဖုန်းဝင်မှုများသာ ခွင့်ပြုရန်"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ကြားဖြတ်ဖုန်း မဝင်ပါနှင့်"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"ဖုန်းဝင်တီးလုံး"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"အကြောင်းကြားချက် တီးလုံး"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ဖုန်းဝင်လျှင် တုန်ခါရန်"</string>
     <string name="notification_section_header" msgid="95661783916799134">"အကြောင်းကြားချက်"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"အကြောင်းကြားချက်မီး လှုပ်ရှားမှု"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"အကြောင်းကြားချက်ရှိလျှင် မီးမှိတ်တုပ်ဖွင့်ရန်"</string>
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"ကိရိယာကို သော့ပိတ်ထားစဉ်"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"အသိပေးချက် အကြောင်းအရာ အားလုံးကို ပြမည်"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"သိမ်မွေ့သည့် အသိပေးချက် အကြောင်းအရာကို ဝှက်ထားရန်"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"အသိပေးချက်များကို လုံးဝ မပြပါနှင့်"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"သင်၏ ကိရိယာကို သော့ပိတ်ထားလျှင်၊ အကြောင်းကြားချက်များကို သင် ဘယ်လို ပြစေလိုပါသလဲ?"</string>
-    <string name="app_notifications_title" msgid="5810577805218003760">"App အသိပေးချက်များ"</string>
-    <string name="other_sound_settings" msgid="3151004537006844718">"အခြား အသံများ"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"နံပါတ်ကွက် သံစဉ်များ"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"မျက်နှာပြင်  သော့ခတ်မှု အသံများ"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"အက်ပ် အသိပေးချက်များ"</string>
+    <string name="other_sound_settings" msgid="3151004537006844718">"အခြားအသံများ"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"ဖုန်းဒိုင်ခွက် အသံ"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"စခရင်ပိတ်သံ"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"အသံများကို ထိုင်ပေးရန်"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"ထိတွေ့မှု အသံများ"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"ထိလျှင် တုန်ခါရန်"</string>
+    <string name="touch_sounds_title" msgid="5326587106892390176">"စခရင်ထိသံ"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"စခရင်ထိလျှင် တုန်ခါရန်"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"စပီကာကို ထိုင်ပေးရန်"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"အသံ အားလုံး"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"မီဒီယာ အသံ သာလျှင်"</string>
@@ -2439,8 +2442,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"သိမ်မွေ့သော"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"လုပ်ပြီး"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"သင်က မပိတ်လိုက်သည့် အထိ"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"ဦးစားပေး  ကြားဖြတ်ဝင်မှုများ"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"ချွတ်ယွင်းချိန်(ဦးစားပေးကြားဖြတ်မှုသာ)"</string>
+    <string name="zen_mode_important_category" msgid="8123274463331022993">"ဦးစားပေး  ကြားဖြတ်ဖုန်းဝင်မှုများ"</string>
+    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"ဖုန်းပိတ်ချိန် (ဦးစားပေး ကြားဖြတ်ဖုန်းများသာ)"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ရက်"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"မရှိ"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"အော်တိုမက်တစ် ပြုလုပ်ခြင်း"</string>
@@ -2471,4 +2474,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"ဒီဆက်တင်ကို ဖွင့်ပေးထားလျှင်၊ သင်သည် လက်ရှိ မျက်နှာပြင်ကို မြင်စေမည့် အခြေအနေ မျိုးမှာ ကိရိယာကို ထားပေးနိုင်သည်။ \n\nမျက်နှာပြင် တစ်ခုကို ပင်ထိုးပေးရန်:\n\n၁။ ဒီဆက်တင်ကို ဖွင့်လိုက်ပါ။\n\n၂။ appကို ဖွင့်လိုက်ပါ။\n\n၃။ မကြာမီ ခလုတ်ကို ထိပါ။\n\n၄။ ပင် အိုင်ကွန်ကို ထိပါ။"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"အလုပ် ပရိုဖိုင်"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(စမ်းသပ်ရေး)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"ကိရိယာကို လှည့်သည့် အခါမှာ"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"မျက်နှာပြင် အကြောင်းအရာ လှည့်ပြရန်"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ဒေါင်လိုက် မြင်ကွင်း ထဲမှာ ရှိနေရန်"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ဘေးတိုက် မြင်ကွင်း ထဲမှာ ရှိနေရန်"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"လက်ရှိ လှည့်ထားမှုအတိုင်း ရှိနေရန်"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index ef11da0..d8ef025 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Paringsforespørsel"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Trykk for å sammenkoble med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Vis mottatte filer"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth-enhetsvelger"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-tillatelse"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"En app ønsker å slå på Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"En app ønsker å gjøre nettbrettet ditt synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Tilbakestilling ble ikke utført fordi tilbakestillingstjenesten ikke er tilgjengelig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vil du tilbakestille?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Tilbakestilling til fabrikkstandard er ikke tilgjengelig for denne brukeren"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Sletter"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Vent litt …"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Slett USB-lagring"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Slett SD-kort"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Sletter alle data i USB-lagr."</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Opphavsrett"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Betingelser"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Åpen kildekode-lisenser"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Kunne ikke hente lisensene."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"henter…"</string>
@@ -1839,8 +1842,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du må angi en PIN-kode eller et passord for skjermlås før du kan bruke legitimasjonslagring."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apper med brukstilgang"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Vil du gi tilgang?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Hvis du gir den tilgang, kan denne appen se generell informasjon om appene på enheten din, for eksempel hvor ofte du bruker dem."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Velg oppførsel når en nødsamtale opprettes"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sikkerhetskopier/tilbakestilling"</string>
@@ -2027,11 +2029,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Bakgrunnsprosessgrense"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Vis alle ANR-er"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Vis dialogruten App svarer ikke for bakgr.apper."</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Bruk GoogleSettings-appen for denne handlingen"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Redus. WebView-nettv.bruken"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Reduser nettverksbruken ved å sende WebView-tilkoblinger via Googles komprimeringstjenere"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Databruk"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens databruk"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatørens metoder for måling av databruk kan være forskjellig fra enheten din."</string>
@@ -2475,4 +2475,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Når denne innstillingen er slått på, kan du angi at enheten skal vise den gjeldende skjermen hele tiden.\n\nSlik fester du skjermen:\n\n1. Slå på denne innstillingen.\n\n2. Åpne en app.\n\n3. Trykk på Nylige-knappen.\n\n4. Trykk på festeikonet."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Jobbprofil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentell)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Når enheten roteres"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotér innholdet på skjermen"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Behold stående visning"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Behold liggende visning"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Behold gjeldende visningsretning"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index d95384c..dfc453e 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"जोडी पार्ने अनुरोध"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>सँग जोड्न छुनुहोस्।"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"प्राप्त गरिएका फाइलहरू देखाउनुहोस्"</string>
-    <string name="device_picker" msgid="8398232791303186677">"ब्लुटुथ उपकरण चयनकर्ता"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"ब्लुटुथ अनुमति अनुरोध"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"एउटा अनुप्रयोग ब्लुटुथ सक्रिय पार्न चाहन्छ।"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"एक अनुप्रयोगले तपाईँको ट्याब्लेटलाई अन्य ब्लुटुथ उपकरणहरूले हेर्न मिल्ने बनाउन चाहन्छ<xliff:g id="TIMEOUT">%1$d</xliff:g> सेकेन्डका लागि।"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"कुनै पुनःसेट हुन सकेन किनभने सिस्टम क्लिएर सेवा उपलब्ध छैन।"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"पुनःसेट गर्ने हो?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"यस प्रयोगकर्ताको लागि कारखाना पुनःसेट गर्ने उपलब्ध छैन"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"मेटाउँदै"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"कृपया प्रतीक्षा गर्नुहोला..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB भण्डारण मेटाउनुहोस्"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD कार्ड मेटाउनुहोस्"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB भण्डारणमा भएका सम्पूर्ण डेटा मेटाउँछ"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"प्रतिलिपि अधिकार"</string>
     <string name="license_title" msgid="1990487604356037871">"इजाजतपत्र"</string>
     <string name="terms_title" msgid="7697580845616764642">"सेवाका सर्तहरू"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"खुला स्रोत लाइसेन्स"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"लाइसेन्स लोड गर्न समस्या आएको छ।"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"लोड हुँदै..."</string>
@@ -2472,4 +2475,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"जब यो सेटिङ् चालू हुन्छ, तपाईंले हालको पर्दामा हेर्ने स्थितिमा राख्ने उपकरण राख्न सक्छौं।\n\n पर्दाको पिन गर्नुहोस:\n\n१। यो सेटिङ् खोल्नुहोस्।\n\n२। अनुप्रयोग खोल्नुहोस्।\n\n३। हालैका बटनहरू छुनुहोस्।\n\n४। पिन प्रतिमा छुनुहोस्।"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"कार्य प्रोफाइल"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रयोगात्मक)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"जब उपकरण घुमाइन्छ"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"पर्दाको सामग्रीहरु घुमाउनुहोस्"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"चित्र दृष्टिकोणमा रहनुहोस्"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"परिदृश्य दृष्टिकोणमा रहनुहोस्"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिमुखिकरणमा रहनुहोस्"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index fa072a3..3fa656f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Koppelingsverzoek"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Raak dit aan om te koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ontvangen bestanden weergeven"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth-apparaatkiezer"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Machtigingsverzoek voor Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Een app wil Bluetooth inschakelen."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Een app wil uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere Bluetooth-apparaten."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Niet opnieuw ingesteld, omdat de service \'Systeem wissen\' niet beschikbaar is."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Opnieuw instellen?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Terugzetten op fabrieksinstellingen is niet beschikbaar voor deze gebruiker"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Wissen"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Even geduld..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-opslag wissen"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD-kaart wissen"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Alle gegevens in USB-opslag wissen"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Auteursrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Licentie"</string>
     <string name="terms_title" msgid="7697580845616764642">"Algemene voorwaarden"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-sourcelicenties"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Er is een probleem bij het laden van de licenties."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Laden..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"U moet een pincode of wachtwoord voor het vergrendelen van het scherm instellen voordat u de referentieopslag kunt gebruiken."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps met gebruikstoegang"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Toegang toestaan?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Als u toegang verleent, kan deze app algemene informatie over de apps op uw apparaat bekijken, zoals hoe vaak u ze gebruikt."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Toon voor noodoproep"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Gedrag bij noodoproepen instellen"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Back-up maken en resetten"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Achtergrondproceslimiet"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Alle ANR\'s weergeven"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"\'App reageert niet\' weerg. voor apps op achtergr."</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Gebruik de app Google Instellingen voor deze bewerking"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Lager netwerkgebr. WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Netwerkgebruik verlagen door WebView-verbindingen als proxy via Google-compressieservers te laten lopen"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Gegevensgebruik van app"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"De door de provider berekende gegevens kunnen afwijken van de berekening van uw apparaat."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Wanneer deze instelling wordt ingeschakeld, kunt u het apparaat in een status plaatsen waarbij de weergave van het huidige scherm wordt vastgezet.\n\nU kunt als volgt een scherm vastzetten:\n\n1. Schakel deze instelling in.\n\n2. Open een app.\n\n3. Tik op de knop \'Recent\'.\n\n4. Tik op het pictogram \'Vastzetten\'."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Werkprofiel"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimenteel)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Wanneer het apparaat wordt gedraaid"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"De inhoud van het scherm draaien"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"In staande stand blijven"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"In liggende stand blijven"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"In huidige stand blijven"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8c0ef5a..a10e112 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Żądanie parowania"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Dotknij, by sparować z <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaż odebrane pliki"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Wybór urządzenia Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Prośba o pozwolenie na włączenie modułu Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikacja chce włączyć Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikacja chce ustawić Twój tablet jako wykrywalny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Nie wykonano resetowania, ponieważ usługa czyszczenia systemu jest niedostępna."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Zresetować?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Przywracanie ustawień fabrycznych nie jest dostępne dla tego użytkownika"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Wymazuję"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Zaczekaj..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Wyczyść nośnik USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Wyczyść kartę SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Wymazuje wszystko z nośnika USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Prawa autorskie"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencja"</string>
     <string name="terms_title" msgid="7697580845616764642">"Warunki i zasady korzystania"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencje open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Wystąpił problem podczas ładowania licencji."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Ładowanie..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Aby korzystać z magazynu danych logowania, musisz ustawić kod PIN lub hasło blokady ekranu."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Mają dostęp do użytkowania"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Zezwolić na dostęp?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Jeśli zezwolisz tej aplikacji na dostęp, będzie ona mogła sprawdzać ogólne informacje o aplikacjach na urządzeniu – np. jak często ich używasz."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sygnał alarmowy"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Skonfiguruj sposób działania w przypadku połączenia alarmowego"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Kopia i kasowanie danych"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limit procesów w tle"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Pokaż wszystkie ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Pokaż okno Aplikacja Nie Reaguje dla aplikacji w tle"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Wykonaj tę operację, używając aplikacji Ustawienia Google"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Ogranicz użycie sieci dla WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Ogranicz użycie sieci, przekierowując połączenia WebView przez serwery kompresujące Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Użycie danych"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Przesył danych w aplikacji"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator sieci komórkowej może obliczać ilość przesłanych danych inaczej niż urządzenie."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Gdy to ustawienie jest włączone, możesz sprawić, że bieżący ekran będzie zawsze widoczny.\n\nAby przypiąć ekran:\n\n1. Włącz to ustawienie.\n\n2. Otwórz aplikację.\n\n3. Kliknij przycisk Ostatnie.\n\n4. Kliknij ikonę pinezki."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profil do pracy"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperymentalne)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Podczas obrotu urządzenia"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Obróć zawartość ekranu"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Pozostaw orientację pionową"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Pozostaw orientację poziomą"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Pozostaw obecną orientację"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9d1b27c..c6385a0 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pedido de emparelhamento"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toque para sincronizar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar ficheiros recebidos"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Selecionador de aparelho Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Pedido de emparelhamento de Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Uma aplicação pretende ativar o Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Uma aplicação pretende tornar o seu tablet visível para outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Não foi efetuada nenhuma reposição porque o serviço System Clear não está disponível."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Repor?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"A reposição de fábrica não está disponível para este utilizador"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"A apagar"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Aguarde..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Apagar armazenamento USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Apagar cartão SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Apaga todos dados armaz. USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Direitos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e condições"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenças open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Ocorreu um problema ao carregar as licenças."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"A carregar..."</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Para poder utilizar o armazenamento de credenciais, é necessário definir primeiro um PIN ou palavra-passe do ecrã de bloqueio."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplic. com acesso de utiliz."</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Permitir acesso?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Se permitir o acesso, esta aplicação pode ver as informações gerais acerca das aplicações no seu dispositivo, como a frequência com que as utiliza."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir o comportamento quando é efetuada uma chamada de emergência"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Cópia de segurança e reposição"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limite proc. em 2º plano"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Mostrar todos os ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostrar erro \"Aplic. não Resp.\" p/ aplic. 2º plano"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Utilizar a aplicação GoogleSettings para esta operação"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Red. util. rede WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Reduzir a utilização de dados da rede ao utilizar as ligações WebView como proxy através dos servidores de compressão da Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilização de dados"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilização dados da apli."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"A contagem do operador de dados pode diferir do seu dispositivo."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Com esta definição ativada, pode colocar o dispositivo num estado que mantém o ecrã atual visível.\n\nPara fixar um ecrã:\n\n1. Ative esta definição.\n\n2. Abra uma aplicação.\n\n3. Toque no botão Recentes.\n\n4. Toque no ícone de fixar."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabalho"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Quando o dispositivo é rodado"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rodar o conteúdo do ecrã"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Manter na vista de retrato"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Manter na vista de paisagem"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manter na orientação atual"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0bcd62a..a1c074d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitação de pareamento"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toque para parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar arquivos recebidos"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Seletor de dispositivo Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitação de permissão para Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Um aplicativo quer ativar o Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Um aplicativo quer tornar seu tablet visível para outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Redefinir?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"A configuração original não está disponível para esse usuário"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Apagando"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Aguarde..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Apagar armazenamento USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Apagar cartão SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Apaga dados do armazen. USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Direitos autorais"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e Condições"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenças código aberto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Há um problema ao carregar as licenças."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Carregando..."</string>
@@ -1598,7 +1601,7 @@
     <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"Caixa de pesquisa oculta"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"O que está consumindo a bateria"</string>
-    <string name="power_usage_not_available" msgid="3214000535532434353">"Dados de uso da bat. indisp."</string>
+    <string name="power_usage_not_available" msgid="3214000535532434353">"Dados de uso da bateria indisponíveis"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> restantes"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> até carregar"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"É necessário configurar PIN ou senha para a tela de bloqueio antes de usar o armazenamento de credenciais."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps com acesso ao uso"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Permitir acesso?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Se você permitir o acesso, este app poderá ver informações gerais sobre os apps em seu dispositivo, como a frequência com que você os usa."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir comportamento durante uma chamada de emergência"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Fazer backup e redefinir"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limite do proc. 2º plano"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Mostrar todos os ANRS"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Exibir \"App não responde\" para app em 2º plano"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Use o app GoogleSettings para esta operação"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Reduzir uso rede WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Reduzir o uso da rede via conexões proxy WebView nos servidores de compactação do Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dados de uso de apps"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
@@ -2442,7 +2442,7 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Concluído"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Até você desativar"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupções prioritárias"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Inatividade (apenas interrup. priorit.)"</string>
+    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Inatividade (apenas interrupções prioritárias)"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dias"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Nenhum"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automação"</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Quando a configuração está ativa, você pode colocar o dispositivo em um estado que mantenha a tela atual em visualização.\n\nPara fixar uma tela:\n\n1. Ative esta configuração.\n\n2. Abra um app.\n\n3. Toque no botão \"Recentes\".\n\n4. Toque no ícone de alfinete."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabalho"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Quando o dispositivo for girado"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Girar o conteúdo da tela"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Manter o modo retrato"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Manter o modo paisagem"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manter a orientação atual"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 324cb4a..6500784 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitare de împerechere"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Atingeţi pentru a împerechea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afişaţi fişierele primite"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Selector de dispozitive Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitare de permisiune Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"O aplicație încearcă să activeze Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"O aplicație încearcă să facă tableta vizibilă pentru alte gadgeturi Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
@@ -1136,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Drept de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenţă"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termeni şi condiţii"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenţe open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"A apărut o problemă la încărcarea licenţelor."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Se încarcă…"</string>
@@ -2492,4 +2497,9 @@
     <skip />
     <string name="managed_user_title" msgid="8101244883654409696">"Profil de serviciu"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Când dispozitivul este rotit"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotiți conținutul ecranului"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Mențineți vizualizarea portret"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Mențineți vizualizarea peisaj"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Mențineți orientarea actuală"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7b4af65..62b2170 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Запрос на сопряжение"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Нажмите для подключения к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Полученные файлы"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Выбор устройства"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запрос разрешения на включение Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Приложение запрашивает разрешение включить Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Одному из приложений требуется, чтобы ваш планшетный ПК был доступен для поиска через Bluetooth на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Сброс не выполнен, поскольку служба System Clear недоступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Выполнить сброс?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Этот пользователь не может выполнять сброс настроек"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Удаление…"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Подождите..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Очистить USB-накопитель"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Очистить SD-карту"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Уничтожает все данные на USB-накопителе"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Авторские права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
     <string name="terms_title" msgid="7697580845616764642">"Условия использования"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лицензии открытого ПО"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"При загрузке лицензий возникла неполадка."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Загрузка…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Перед использованием хранилища учетных данных необходимо задать PIN-код или пароль блокировки экрана."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Приложения, получившие доступ"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Разрешить доступ?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Это приложение получит доступ к общей информации об установленных приложениях (например, о частоте их использования)."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тональный сигнал экстренного вызова"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Настроить режим работы при экстренном вызове"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Восстановление и сброс"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Лимит фоновых процессов"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Все ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Уведомлять о том, что приложение не отвечает"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Для выполнения этого действия используйте приложение \"Настройки Google\""</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Сокращать трафик WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Сокращать трафик при обработке WebView за счет подключения к DCP-серверам Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Передача данных"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Трафик приложения"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Статистика вашего оператора связи может отличаться от статистики устройства."</string>
@@ -2475,4 +2475,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"С помощью этой функции можно закрепить нужный экран, чтобы он постоянно отображался на устройстве.\n\nВот как это сделать:\n\n1. Включите эту функцию.\n\n2. Откройте приложение.\n\n3. Нажмите кнопку \"Недавние\".\n\n4. Нажмите на значок булавки."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Рабочий профиль"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(экспериментальная настройка)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Поворот экрана"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Поворот экрана"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Зафиксировать в вертикальной ориентации"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Зафиксировать в горизонтальной ориентации"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Зафиксировать в текущей ориентации"</string>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index b35306b..a098364 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"යුගල කිරීමේ ඉල්ලීම"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> සමඟ යුගල කිරීමට ස්පර්ශ කරන්න."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ලැබුණු ගොනු පෙන්වන්න"</string>
-    <string name="device_picker" msgid="8398232791303186677">"බ්ලූටූත් උපාංග තෝරනය"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"බ්ලූටූත් අවසර අයැදුම"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"යෙදුමකට බ්ලූටූත් සක්‍රිය කිරීමට අවශ්‍යව ඇත."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"යෙදුමක් ඔබගේ ටැබ්ලටය තත්පර <xliff:g id="TIMEOUT">%1$d</xliff:g> කට වෙනත් බ්ලූටූත් උපාංග වෙත දෘශ්‍ය වීමට අවශ්‍යව ඇත."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"පද්ධති ඉවත් කෙරුම් සේවාව නොමැති නිසා නැවත සැකසුමක් සිදු නොකෙරුණි"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"යළි සකසන්නද?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"මෙම පරිශීලකයා වෙතට කර්මාන්තශාලා යළි පිහිටුවීම නොමැත"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"මකමින්"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"කරුණාකර රැඳී සිටින්න..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB ආචයනය මකන්න"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD කාඩ් පත මකන්න"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB ආචයනයේ ඇති සියලු දත්ත මකා දමයි"</string>
@@ -1140,6 +1139,10 @@
     <string name="copyright_title" msgid="865906688917260647">"ප්‍රකාශන හිමිකම"</string>
     <string name="license_title" msgid="1990487604356037871">"බලපත්‍රය"</string>
     <string name="terms_title" msgid="7697580845616764642">"නියමයන් සහ කොන්දේසි"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"විවෘත කේත බලපත්‍ර"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"බලපත්‍ර පුර්ණය කිරීමේදී ගැටලුවක් ඇතිවිය."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"පූරණය වෙමින්..."</string>
@@ -1839,8 +1842,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"අක්තපත්‍ර ආචයනය ඔබ භාවිතා කිරීමට පෙර අගුළු තිර PIN එකක් හෝ මුරපදයක් ඔබ දැමිය යුතුය."</string>
     <string name="usage_access_title" msgid="332333405495457839">"භාවිත ප්‍රවේශය සමඟ යෙදුම්"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"ප්‍රවේශයට අවසර දෙන්නද?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"ඔබ ප්‍රවේශයට ඉඩ දේ නම්, කොපමණ කාලයකට වරක් ඔබගේ යෙදුම් භාවිතා කරන්නේද වැනි, ඔබගේ යෙදුම් පිළිබඳ සාමාන්‍ය තොරතුරු මෙම යෙදුමට බැලිය හැක."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"හදිසි නාදය"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"හදිසි ඇමතුමක් ලැබුණ විට හැසිරීම සකසන්න"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"උපස්ථ කරන්න සහ යළි පිහිටුවන්න"</string>
@@ -2027,11 +2029,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"පසුබිම් ක්‍රියාවලි සීමාව"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"සියලුම ANR පෙන්වන්න"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"පසුබිම් යෙදුම් වලට යෙදුම ප්‍රතිචාර නොදක්වයි කවුළුව පෙන්වන්න"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"කරුණාකර මෙම ක්‍රියාව සඳහා GoogleSettings යෙදුම භාවිතා කරන්න"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView ජාල භාවිතය අඩු කරන්න"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Google සම්පීඩන සේවාදායකයන් තුළින් WebView සම්බන්ධතා ප්‍රොක්සි කිරීම මඟින් භාවිතය අඩු කරන්න"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"දත්ත භාවිතය"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"යෙදුම් දත්ත භාවිතය"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"ඔබගේ උපාංගයේ වාහක දත්ත ගිණුම් ගත කිරීම ඇතැම් විට වැර දේ."</string>
@@ -2475,4 +2475,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"මෙම සැකසීම් සක්‍රිය විට, දැන් තිබෙන තීරය දර්ශනක් තුළ තිබෙන ලෙස තත්ත්වයක ඔබට උපාංගය තිබිය හැක.\n\nතිරයට ඇමිණිමට:\n\n1. මෙම සැකසීම් සක්‍රිය කරන්න.\n\n2. යෙදුම විවෘත කරන්න.\n\n3. මෑත බොත්තම ස්පර්ශ කරන්න.\n\n4. ඇමුණුම් නිරූපකය ස්පර්ශ කරන්න."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"කාර්යාල පැතිකඩ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(පරීක්ෂණාත්මක)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"උපංගය කරකැවූ විට"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"තීරයේ අන්තර්ගතය කරකවන්න"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"සිරස් දසුන තුළ සිටින්න"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"තිරස් දසුන තුළ සිටින්න"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"දැනට තිබෙන දිශානතියේ සිටින්න"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4f74d75..1df7c6c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Žiadosť na párovanie"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> spárujete dotykom."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobraziť prijaté súbory"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Výber zariadenia Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Žiadosť o povolenie zariadenia Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikácia chce zapnúť rozhranie Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s prepnúť váš tablet do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Pokus o obnovenie sa neuskutočnil, pretože služba System Clear nie je k dispozícii."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Obnoviť?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Obnovenie továrenských nastavení nie je dostupné pre tohto používateľa"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Prebieha vymazávanie"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Čakajte..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Vymazať ukladací priestor USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Vymazať kartu SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Vymaže údaje v ukl. priestore USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Autorské práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Zmluvné podmienky"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencie otvoreného zdroja"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Pri načítavaní licencií sa vyskytla chyba."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Prebieha načítavanie…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Pred použitím úložiska poverení musíte nastaviť kód PIN alebo heslo zámky obrazovky."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplik. s príst. k používaniu"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Povoliť prístup?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Ak jej povolíte prístup, táto aplikácia uvidí informácie o ostatných aplikáciách na zariadení, napríklad ako často ich používate."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tiesňové vyzváňanie"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastaviť správanie pri tiesňovom volaní"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Zálohovať a obnoviť"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limit procesov na pozadí"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Zobrazovať všetky ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Zobrazovať dialóg „Aplikácia neodpovedá“ aj pre aplikácie na pozadí"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Na túto operáciu použite aplikáciu Nastavenia Google"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Znížiť využitie siete technológiou WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Znížte využitie siete sprostredkovaním pripojení WebView prostredníctvom serverov Google na kompresiu údajov"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Využitie dát"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Využitie dát aplikáciou"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Účtovanie dát operátora sa môže pre vaše zariadenie líšiť."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Po zapnutí tohto nastavenia môžete zariadenie prepnúť do stavu, v ktorom sa bude zobrazovať iba aktuálna obrazovka.\n\nPostup pripnutia obrazovky:\n\n1. Zapnite toto nastavenie.\n\n2. Otvorte požadovanú aplikáciu.\n\n3. Dotknite sa tlačidla Nedávne.\n\n4. Dotknite sa ikony špendlíka."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Pracovný profil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentálne)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Pri otáčaní zariadenia"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Otáčať obsah obrazovky"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Ponechať obrazovku v zobrazení na výšku"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Ponechať obrazovku v zobrazení na šírku"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ponechať obrazovku v súčasnej orentácii"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 73be97c..6e34724 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahteva za seznanitev"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Dotaknite se za povezovanje z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaži prejete datoteke"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Izbirnik naprav Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zahteva za dovoljenje za uporabo funkcije Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikacija želi vklopiti Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikacija želi, da lahko druge naprave Bluetooth vidijo vaš tablični računalnik toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Ponastavitev ni opravljena, ker storitev System Clear ni na voljo."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Želite ponastaviti?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Ponastavitev na tovarniške nastavitve ni na voljo za tega uporabnika"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Brisanje"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Počakajte ..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Izbriši pomnilnik USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Izbriši kartico SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Izbriše vse podatke na pomnilniku USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Avtorska pravica"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Določila in pogoji"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licence za odprto kodo"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Pri nalaganju licenc je prišlo do težave."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Nalaganje …"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Preden lahko uporabite shrambo poverilnic, morate nastaviti kodo PIN ali geslo za zaklepanje zaslona."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apl. z dost. do pod. o uporabi"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Želite omogočiti dostop?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Če tej aplikaciji omogočite dostop, ji bodo dostopni splošni podatki o aplikacijah v napravi, na primer, kako pogosto jih uporabljate."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton v sili"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavi način delovanja ob klicanju v sili"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Izdelaj varnostno kopijo in ponastavi"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Omejitev postopkov v ozadju"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Pokaži okna neodzivanj"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Prikaz pogovornega okna za neodzivanje programa v ozadju"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Za to dejanje uporabite aplikacijo Nastavitve za Google"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Zmanjšaj porabo omrežja WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Zmanjšanje porabe podatkov, prenesenih v omrežju, s posredovanjem povezav WebView prek Googlovih strežnikov za stiskanje"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Podatkovni promet"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Poraba podatk. aplikacije"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operaterjeve meritve porabe podatkov so morda drugačne kot v napravi."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Ko je ta nastavitev vklopljena, lahko omogočite, da je trenutni zaslon v napravi vedno viden.\n\nPripenjanje zaslona:\n\n1. Vklopite to nastavitev.\n\n2. Odprite aplikacijo.\n\n3. Dotaknite se gumba »Nedavni«.\n\n4. Dotaknite se ikone žebljička."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Delovni profil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Poskusno)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Ko se naprava zasuka"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Zasukaj vsebino zaslona"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Ohrani pokončni pogled"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Ohrani ležeči pogled"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ohrani trenutno postavitev"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2440538..c114337 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Захтев за упаривање"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Додирните да бисте упарили са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Приказ примљених датотека"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Бирач Bluetooth уређаја"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Захтев за Bluetooth дозволу"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Апликација жели да укључи Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Апликација жели да учини таблет видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Није обављено враћање на почетне вредности зато што услуга брисања система није доступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Враћање на почетне вредности?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Ресетовање на фабричка подешавања није доступно за овог корисника"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Брисање"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Сачекајте..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Брисање USB меморије"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Избриши SD картицу"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Брише целу USB меморију"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Ауторска права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
     <string name="terms_title" msgid="7697580845616764642">"Услови и одредбе"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лиценца отвореног кода"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Дошло је до проблема приликом учитавања лиценци."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Учитавање…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Треба да подесите PIN или лозинку за закључавање екрана да бисте могли да користите складиште акредитива."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Апл. са прист. подацима о кор."</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Желите да дозволите приступ?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Ако дозволите приступ, ова апликација ће моћи да прегледа опште информације у вези са апликацијама на уређају, на пример, колико их често користите."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за хитне позиве"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Подешавање понашања када се успоставља хитни позив"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Резервна копија и ресетовање"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Ограничење позад. процеса"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Прикажи све ANR-ове"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Прикажи дијалог Апликација не реагује за апликације у позадини"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Користите апликацију Google подешавања за ову операцију"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Смањи употребу WebView мреже"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Смањите коришћење мреже тако што ћете користити прокси за WebView везе преко Google сервера за компримовање"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Коришћење података"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Коришћење података аплик."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Обрачун података код мобилног оператера се можда разликује од вашег уређаја."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Када је ово подешавање укључено, можете да пребаците уређај у стање у ком ће актуелни екран увек бити видљив.\n\nДа бисте закачили екран:\n\n1. Укључите ово подешавање.\n\n2. Отворите ову апликацију.\n\n3. Додирните дугме Недавно.\n\n4. Додирните икону чиоде."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Профил за посао"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Када се уређај ротира"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ротирај садржај екрана"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Задржи усправни приказ"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Задржи водоравни приказ"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Задржи актуелни положај"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 6688b6e..9315fe1 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Begäran om parkoppling"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Tryck om du vill koppla till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Visa mottagna filer"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth-enhetsväljare"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Begäran om Bluetooth-behörighet"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"En app vill aktivera Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"En app vill göra din surfplatta synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Återställningen utfördes inte eftersom tjänsten för systemrensning inte är tillgänglig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vill du återställa?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Den här användaren kan inte återställa till standardinställningarna"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Rensar"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Vänta ..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Radera USB-lagring"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Radera SD-kort"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Raderar allt på USB-enheten"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Upphovsrätt"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Användarvillkor"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Öppen källkodslicens"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Ett problem inträffade när licenserna lästes in."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Läser in…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du måste ange en PIN-kod eller ett lösenord för skärmlåset för att kunna använda uppgiftslagring."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Appar med användningsåtkomst"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Vill du tillåta åtkomst?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Om du tillåter åtkomst blir allmän information om apparna, till exempel hur ofta du använder dem, tillgänglig för den här appen."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nödsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ange beteende vid nödsamtal"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Säkerhetskopiering och återställning"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Begränsa bakgrundsprocess"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Visa alla som inte svarar"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Visa dialogrutan om att appen inte svarar för bakgrundsappar"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Använd appen Google Inställningar för den här åtgärden"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Minska nätverksanvändningen via WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Minska nätverksanvändningen genom att använda WebView-anslutningar via proxy genom Googles komprimeringsservrar"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataanvändning"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens dataanvändning"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatörens dataredovisning kan skilja sig från din enhets dataredovisning."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"När den här inställningen är aktiverad kan du ställa in enheten i ett läge som behåller den aktuella skärmen i vyn.\n\nSå här fäster du skärmen:\n\n1. Aktivera den här inställningen.\n\n2.Öppna en app.\n\n3. Tryck på knappen Senaste.\n\n4. Tryck på nålikonen."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Arbetsprofil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(experimentellt)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"När enheten roterar"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotera skärmens innehåll"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Fortsätt använda stående riktning"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Fortsätt använda liggande riktning"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Fortsätt använda aktuell riktning"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3c5c74a..b86ce84 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Ombi la ulinganishaji"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Gusa ili kuoanisha na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Onyesha faili zilizopokewa"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Kichagua kifaa cha Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Ombi la kibali cha Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Programu inataka kuwasha Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Programu inataka kufanya kompyuta yako ndogo ionekane kwenye vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
@@ -1032,10 +1033,8 @@
     <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">"Iwekwe upya?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Urejeshaji wa mipangilio ya kiwandani haupatikani kwa mtumiaji huyu"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Inafuta"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Tafadhali subiri..."</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>
@@ -1132,6 +1131,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Hakimilki"</string>
     <string name="license_title" msgid="1990487604356037871">"Leseni"</string>
     <string name="terms_title" msgid="7697580845616764642">"Sheria na Masharti"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Chanzo cha leseni huria"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Kuna hitilafu wakati wa kupakia leseni"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Inapakia…"</string>
@@ -1818,7 +1821,7 @@
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Chora mchoro wako wa kufungua"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Unahitaji kuweka mchoro wako wa kufungua ili uthibitishe usakinishaji wa hati tambulishi."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
-    <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ingiza nenosiri ya hifadhi ya stakabadhi"</string>
+    <string name="credentials_unlock_hint" msgid="2301301378040499348">"Weka nenosiri ili stakabadhi zihifadhiwe"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nenosiri la sasa:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Ondoa maudhui yote?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Lazima nenosiri liwe na angalau herufi 8."</string>
@@ -1831,8 +1834,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Unahitaji kuweka PIN au nenosiri la kufunga skrini kabla ya kutumia hifadhi ya hati za uthibitisho."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Programu zinazofikia data ya matumizi"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Ungependa kuruhusu ufikiaji?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Ukiruhusu ufikiaji, programu hii inaweza kusoma maelezo ya jumla kuhusu programu zilizo kwenye kifaa chako, kama vile unazitumia mara nyingi kiasi gani."</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">"Hifadhi nakala na urejeshe mipangilio ya kiwanda"</string>
@@ -2019,11 +2021,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Kiwango cha mchakato wa mandari nyuma"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Onyesha ANR zote"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Onyesha kisanduku kidadisi cha Programu Haiitikii kwa programu za usuli"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Tafadhali tumia programu ya Mipangilio ya Google kwa utendaji huu"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Punguza Matumizi ya WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Punguza matumizi ya mtandao kwa kuhifadhi katika seva mbadala miunganisho ya Mwonekano wa Wavuti kupitia seva za kugandamiza za Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Matumizi ya data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Matumizi data ya programu"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Hesabu ya data ya mtoa huduma huenda ikatofautiana na inayofanyika katika kifaa chako."</string>
@@ -2467,4 +2467,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Mipangilio hii itakapowashwa, unaweza kuweka kifaa katika hali itakayoendelea kuonyesha skrini ya sasa.\n\nIli ubandike skrini:\n\n1. Washa mipangilio hii.\n\n2. Fungua programu.\n\n3. Gusa kitufe cha Hivi Majuzi.\n\n4. Gusa aikoni ya kubandika."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Wasifu wa kazi"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Majaribio)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kifaa kinapozungushwa"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Zungusha maudhui ya skrini"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Baki katika onyesho la wima"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Baki katika onyesho la mlalo"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Baki katika mkao wa sasa"</string>
 </resources>
diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta-rIN/arrays.xml
index 9322400..5048199 100644
--- a/res/values-ta-rIN/arrays.xml
+++ b/res/values-ta-rIN/arrays.xml
@@ -128,8 +128,8 @@
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"புஷ் பொத்தான்"</item>
-    <item msgid="1624323946324499595">"பியர் சாதனத்திலிருந்து PIN"</item>
-    <item msgid="5366790421523328066">"இந்தச் சாதனத்தில் உள்ள PIN"</item>
+    <item msgid="1624323946324499595">"பியர் சாதனத்திலிருந்து பின்"</item>
+    <item msgid="5366790421523328066">"இந்தச் சாதனத்தில் உள்ள பின்"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"இணைக்கப்பட்டது"</item>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 5838427..8564d35 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -42,7 +42,7 @@
     <string name="ims_reg_required_off" msgid="1720570343422743943">"IMS பதிவு தேவை முடக்கப்பட்டது"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram ஐக் காலியாக்குவதை இயக்கு"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte ram ஐக் காலியாக்குவதை முடக்கு"</string>
-    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM முகவரி புத்தகத்தைக் காட்டு"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"சிம் முகவரி புத்தகத்தைக் காட்டு"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"நிலையான அழைப்பு எண்களைக் காட்டு"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"சேவை அழைப்பு எண்களைக் காட்டு"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"PDP பட்டியலைப் பெறு"</string>
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"இணைப்பிற்கான கோரிக்கை"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைவதற்குத் தொடவும்."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"பெற்ற கோப்புகளைக் காட்டு"</string>
-    <string name="device_picker" msgid="8398232791303186677">"புளூடூத் சாதனத் தேர்வி"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"புளூடூத் அனுமதி கோரிக்கை"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"பயன்பாடு புளூடூத் ஐ இயக்க விரும்புகிறது."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"உங்கள் டேப்லெட்டை பிற புளூடூத் சாதனங்களுக்கு <xliff:g id="TIMEOUT">%1$d</xliff:g> வினாடிகள் தெரியும்படி வைத்திருக்க பயன்பாடு விரும்புகிறது."</string>
@@ -348,21 +349,21 @@
     <string name="location_settings_title" msgid="1369675479310751735">"இருப்பிடம்"</string>
     <string name="account_settings_title" msgid="626177544686329806">"கணக்குகள்"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"பாதுகாப்பு"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"எனது இருப்பிடம், திரை திற, SIM கார்டு பூட்டு, நற்சான்று சேமிப்பிட பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, நற்சான்று சேமிப்பிட பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"எனது இருப்பிடம், திரையைத் திற, நற்சான்று சேமிப்பிடப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"கடவுச்சொற்கள்"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"முறைமையாக்கம்"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"டேப்லெட்டை முறைமையாக்கு"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"மொபைலை முறைமையாக்கு"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"முறைமையாக்கப்பட்டது"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"உங்கள் கணக்குகள், அமைப்புகள், பதிவிறக்கிய பயன்பாடுகள் மற்றும் அவற்றின் தரவு, மீடியா மற்றும் பிற கோப்புகள் என அனைத்தையும் குறியாக்கலாம். உங்கள் டேப்லெட்டைக் குறியாக்கிய பிறகு, திரைப்பூட்டை (அதாவது வடிவம் அல்லது PIN அல்லது கடவுச்சொல்) அமைத்திருந்தால், ஒவ்வொரு முறையும் டேப்லெட்டை இயக்கும்போது குறிநீக்குவதற்கு திரையைத் திறக்க வேண்டும். உங்களின் எல்லா தரவையும் அழித்து, ஆரம்ப நிலைக்கு மீட்டமைப்பதே குறிநீக்குவதற்கான மற்றொரு வழியாகும்.\n\nகுறியாக்குவதற்கு ஒரு மணிநேரம் அல்லது அதற்கு மேல் ஆகலாம். சார்ஜ் செய்த பேட்டரியுடன் தொடங்கி, செயல் முடியும் வரை சார்ஜ் ஆகும் நிலையிலேயே வைக்கவும். செயலில் குறுக்கிட்டால், உங்கள் தரவில் சிலவற்றை அல்லது மொத்தத்தையும் இழப்பீர்கள்."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"உங்கள் கணக்குகள், அமைப்புகள், பதிவிறக்கிய பயன்பாடுகள் மற்றும் அவற்றின் தரவு, மீடியா மற்றும் பிற கோப்புகள் என அனைத்தையும் குறியாக்கலாம். உங்கள் மொபைலைக் குறியாக்கிய பிறகு, திரைப்பூட்டை (அதாவது வடிவம் அல்லது PIN அல்லது கடவுச்சொல்) அமைத்திருந்தால், ஒவ்வொரு முறையும் மொபைலை இயக்கும்போது குறிநீக்குவதற்கு திரையைத் திறக்க வேண்டும். உங்களின் எல்லா தரவையும் அழித்து, ஆரம்ப நிலைக்கு மீட்டமைப்பதே குறிநீக்குவதற்கான மற்றொரு வழியாகும்.\n\nகுறியாக்குவதற்கு ஒரு மணிநேரம் அல்லது அதற்கு மேல் ஆகலாம். சார்ஜ் செய்த பேட்டரியுடன் தொடங்கி, செயல் முடியும் வரை சார்ஜ் ஆகும் நிலையிலேயே வைக்கவும். செயலில் குறுக்கிட்டால், உங்கள் தரவில் சிலவற்றை அல்லது மொத்தத்தையும் இழப்பீர்கள்."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"உங்கள் கணக்குகள், அமைப்புகள், பதிவிறக்கிய பயன்பாடுகள் மற்றும் அவற்றின் தரவு, மீடியா மற்றும் பிற கோப்புகள் என அனைத்தையும் குறியாக்கலாம். உங்கள் டேப்லெட்டைக் குறியாக்கிய பிறகு, திரைப்பூட்டை (அதாவது வடிவம் அல்லது பின் அல்லது கடவுச்சொல்) அமைத்திருந்தால், ஒவ்வொரு முறையும் டேப்லெட்டை இயக்கும்போது குறிநீக்குவதற்கு திரையைத் திறக்க வேண்டும். உங்களின் எல்லா தரவையும் அழித்து, ஆரம்ப நிலைக்கு மீட்டமைப்பதே குறிநீக்குவதற்கான மற்றொரு வழியாகும்.\n\nகுறியாக்குவதற்கு ஒரு மணிநேரம் அல்லது அதற்கு மேல் ஆகலாம். சார்ஜ் செய்த பேட்டரியுடன் தொடங்கி, செயல் முடியும் வரை சார்ஜ் ஆகும் நிலையிலேயே வைக்கவும். செயலில் குறுக்கிட்டால், உங்கள் தரவில் சிலவற்றை அல்லது மொத்தத்தையும் இழப்பீர்கள்."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"உங்கள் கணக்குகள், அமைப்புகள், பதிவிறக்கிய பயன்பாடுகள் மற்றும் அவற்றின் தரவு, மீடியா மற்றும் பிற கோப்புகள் என அனைத்தையும் குறியாக்கலாம். உங்கள் மொபைலைக் குறியாக்கிய பிறகு, திரைப்பூட்டை (அதாவது வடிவம் அல்லது பின் அல்லது கடவுச்சொல்) அமைத்திருந்தால், ஒவ்வொரு முறையும் மொபைலை இயக்கும்போது குறிநீக்குவதற்கு திரையைத் திறக்க வேண்டும். உங்களின் எல்லா தரவையும் அழித்து, ஆரம்ப நிலைக்கு மீட்டமைப்பதே குறிநீக்குவதற்கான மற்றொரு வழியாகும்.\n\nகுறியாக்குவதற்கு ஒரு மணிநேரம் அல்லது அதற்கு மேல் ஆகலாம். சார்ஜ் செய்த பேட்டரியுடன் தொடங்கி, செயல் முடியும் வரை சார்ஜ் ஆகும் நிலையிலேயே வைக்கவும். செயலில் குறுக்கிட்டால், உங்கள் தரவில் சிலவற்றை அல்லது மொத்தத்தையும் இழப்பீர்கள்."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"டேப்லெட்டை முறைமையாக்கு"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"மொபைலை முறைமையாக்கு"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"உங்கள் பேட்டரியை சார்ஜ் செய்து மீண்டும் முயற்சிக்கவும்."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"உங்கள் சார்ஜரை செருகி, மீண்டும் முயற்சிக்கவும்."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"திரைப் பூட்டு PIN அல்லது கடவுச்சொல் இல்லை"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"முறைமையாக்கத்தைத் தொடங்குவதற்கு முன் பூட்டு திரைக்கான PIN அல்லது கடவுச்சொல்லை அமைக்க வேண்டும்."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"திரைப் பூட்டு பின் அல்லது கடவுச்சொல் இல்லை"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"முறைமையாக்கத்தைத் தொடங்குவதற்கு முன் பூட்டு திரைக்கான பின் அல்லது கடவுச்சொல்லை அமைக்க வேண்டும்."</string>
     <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"சாதனத்தை முறைமையாக்குவதை உறுதிசெய்ய, திறப்பதற்கான வடிவத்தை வரைய வேண்டும்."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"முறைமையாக்கவா?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"முறைமையாக்கச் செயல்முறையானது திரும்பப்பெற முடியாததாகும், நீங்கள் அதில் குறுக்கிட்டால், தரவை இழக்க நேரிடும். முறைமையாக்கம் செய்ய ஒரு மணிநேரம் அல்லது அதற்கு அதிகமான நேரம் எடுக்கும், அப்போது டேப்லெட் பலமுறை மீண்டும் தொடங்கலாம்."</string>
@@ -386,7 +387,7 @@
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"மாற்று பூட்டை தேர்வுசெய்க"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"திரைப் பூட்டு"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"பூட்டுத் திரையை மாற்றவும்"</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"வடிவம், PIN அல்லது கடவுச்சொல் பாதுகாப்பை மாற்றவும் அல்லது முடக்கவும்."</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"வடிவம், பின் அல்லது கடவுச்சொல் பாதுகாப்பை மாற்றவும் அல்லது முடக்கவும்."</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"திரையைப் பூட்டுவதற்கான முறையைத் தேர்வுசெய்யவும்"</string>
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"முகத்தால் திறக்கும் அம்சம் உங்களைப் பார்க்க முடியாதபோது, எவ்வாறு திறக்க விரும்புகிறீர்கள்?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"ஏதுமில்லை"</string>
@@ -397,7 +398,7 @@
     <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>
-    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"பின்"</string>
     <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>
@@ -406,23 +407,23 @@
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ஸ்வைப் செய்"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"முகத்தால் திறத்தல்"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"வடிவம்"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"பின்"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"கடவுச்சொல்"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"திரைப் பூட்டை முடக்கு"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"திறப்பதற்கான வடிவத்தை அகற்று"</string>
-    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"திறக்கும் PIN ஐ அகற்று"</string>
+    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"திறக்கும் பின்னை அகற்று"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"திறக்கும் கடவுச்சொல்லை அகற்று"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"திறப்பதற்கான வடிவத்தை மாற்று"</string>
-    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"திறக்கும் PIN ஐ மாற்று"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"திறக்கும் பின்னை மாற்று"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"திறப்பதற்கான கடவுச்சொல்லை மாற்று"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"கடவுச்சொல்லில் கண்டிப்பாக குறைந்தது %d எழுத்துக்குறிகளாவது இருக்க வேண்டும்"</string>
-    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN இல் குறைந்தது %d இலக்கங்கள் இருக்க வேண்டும்"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"பின்னில் குறைந்தது %d இலக்கங்கள் இருக்க வேண்டும்"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"முடிந்தததும் தொடர்க என்பதைத் தொடவும்"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"தொடர்க"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"கடவுச்சொல்லானது <xliff:g id="NUMBER">%d</xliff:g> எழுத்துக்குறிகளுக்கும் குறைவாகவே இருக்க வேண்டும்."</string>
-    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN ஆனது <xliff:g id="NUMBER">%d</xliff:g> இலக்கங்களுக்கும் குறைவாகவே இருக்க வேண்டும்."</string>
-    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN இல் 0-9 வரையிலான இலக்கங்கள் மட்டுமே இருக்க வேண்டும்."</string>
-    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"சாதன நிர்வாகி சமீபத்திய PIN ஐப் பயன்படுத்துவதை அனுமதிக்கமாட்டார்."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"பின் ஆனது <xliff:g id="NUMBER">%d</xliff:g> இலக்கங்களுக்கும் குறைவாகவே இருக்க வேண்டும்."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"பின்னில் 0-9 வரையிலான இலக்கங்கள் மட்டுமே இருக்க வேண்டும்."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"சாதன நிர்வாகி சமீபத்திய பின் ஐப் பயன்படுத்துவதை அனுமதிக்கமாட்டார்."</string>
     <string name="lockpassword_illegal_character" msgid="8742901630116866738">"கடவுச்சொல்லில் முறையற்ற எழுத்துக்குறி உள்ளது."</string>
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"கடவுச்சொல்லில் குறைந்தது ஒரு எழுத்து இருக்க வேண்டும்."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"கடவுச்சொல் குறைந்தது ஒரு இலக்கம் இருக்க வேண்டும்."</string>
@@ -473,9 +474,9 @@
     <string name="bluetooth_enter_pin_msg" msgid="4954085254142996877">"சாதனம்"</string>
     <string name="bluetooth_pairing_key_msg" msgid="333005542843637754">"இணைத்தல் குறியீடு"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"இணைத்தல் குறியீட்டை உள்ளிட்டு, திரும்பு அல்லது என்டரை அழுத்தவும்"</string>
-    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN இல் எழுத்துகள் அல்லது எழுத்துக்குறிகள் உள்ளன"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"பின்னில் எழுத்துகள் அல்லது எழுத்துக்குறிகள் உள்ளன"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"பொதுவாக 0000 அல்லது 1234"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"PIN ஐ வேறொரு சாதனத்திலும் உள்ளிட வேண்டியிருக்கலாம்."</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"பின்னை வேறொரு சாதனத்திலும் உள்ளிட வேண்டியிருக்கலாம்."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"நீங்கள் இந்தக் கடவுச்சொல்லை வேறொரு சாதனத்திலும் உள்ளிட வேண்டியிருக்கலாம்."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"பின்வருவதுடன் இணைக்கவும்:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;இது, இந்தக் கடவுச்சொல்லைக் காட்டுகிறது என்பதை உறுதிப்படுத்தவும்:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"பின்வருவதில் இருந்து:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;இந்தச் சாதனத்தை இணைக்கவா?"</string>
@@ -485,7 +486,7 @@
     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ரத்துசெய்"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைய முடியவில்லை."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"தவறான PIN அல்லது கடவுச்சொல் காரணமாக <xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்க முடியவில்லை."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"தவறான பின் அல்லது கடவுச்சொல் காரணமாக <xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்க முடியவில்லை."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்க முடியவில்லை."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> இணைப்பதை நிராகரித்தது."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்க முடியவில்லை."</string>
@@ -849,37 +850,37 @@
     <string name="doze_summary" msgid="8300817661725517088">"சாதனத்தை எடுக்கும் போது அல்லது அறிவிப்புகள் வரும் போது திரையை இயக்கும்"</string>
     <string name="title_font_size" msgid="4405544325522105222">"எழுத்துரு அளவு"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"எழுத்துரு அளவு"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM கார்டின் பூட்டு அமைப்பு"</string>
-    <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM கார்டின் பூட்டை அமை"</string>
-    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM கார்டு பூட்டு"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM கார்டைப் பூட்டு"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"டேப்லெட்டைப் பயன்படுத்த PIN தேவை"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"மொபைலைப் பயன்படுத்த PIN தேவை"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"டேப்லெட்டைப் பயன்படுத்த PIN தேவை"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"மொபைலைப் பயன்படுத்த PIN தேவை"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"SIM இன் PIN ஐ மாற்று"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM கார்டைப் பூட்டு"</string>
-    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM கார்டை தடைநீக்கு"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"பழைய SIM PIN"</string>
-    <string name="sim_enter_new" msgid="8742727032729243562">"புதிய SIM PIN"</string>
-    <string name="sim_reenter_new" msgid="6523819386793546888">"புதிய PIN ஐ மீண்டும் உள்ளிடவும்"</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
-    <string name="sim_bad_pin" msgid="2345230873496357977">"தவறான PIN"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"சிம் கார்டின் பூட்டு அமைப்பு"</string>
+    <string name="sim_lock_settings_category" msgid="5136244267576697004">"சிம் கார்டின் பூட்டை அமை"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"சிம் கார்டு பூட்டு"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"சிம் கார்டைப் பூட்டு"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"டேப்லெட்டைப் பயன்படுத்த பின் தேவை"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"மொபைலைப் பயன்படுத்த பின் தேவை"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"டேப்லெட்டைப் பயன்படுத்த பின் தேவை"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"மொபைலைப் பயன்படுத்த பின் தேவை"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"சிம்மின் பின்னை மாற்று"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"சிம் பின்"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"சிம் கார்டைப் பூட்டு"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"சிம் கார்டை தடைநீக்கு"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"பழைய சிம் பின்"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"புதிய சிம் பின்"</string>
+    <string name="sim_reenter_new" msgid="6523819386793546888">"புதிய பின்னை மீண்டும் உள்ளிடவும்"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"சிம் பின்"</string>
+    <string name="sim_bad_pin" msgid="2345230873496357977">"தவறான பின்"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PINகள் பொருந்தவில்லை"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"PIN ஐ மாற்ற முடியவில்லை.\nதவறான PIN ஆக இருக்கலாம்."</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN வெற்றிகரமாக மாற்றப்பட்டது"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM கார்டின் பூட்டு நிலையை மாற்ற முடியவில்லை.\nதவறான PIN ஆக இருக்கலாம்."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"பின்னை மாற்ற முடியவில்லை.\nதவறான பின்னாக இருக்கலாம்."</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"சிம் பின் வெற்றிகரமாக மாற்றப்பட்டது"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"சிம் கார்டின் பூட்டு நிலையை மாற்ற முடியவில்லை.\nதவறான பின்னாக இருக்கலாம்."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"சரி"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ரத்துசெய்"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"பல SIMகள் உள்ளன"</string>
-    <string name="sim_multi_sims_summary" msgid="7018740080801483990">"செல்லுலார் தரவிற்கான SIM ஐத் தேர்வுசெய்யவும்."</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PIN குறியீடு தவறானது, உங்கள் சாதனத்தைத் திறக்க, உங்கள் மொபைல் நிறுவனத்தைத் தொடர்புகொள்ள வேண்டும்."</string>
+    <string name="sim_multi_sims_summary" msgid="7018740080801483990">"செல்லுலார் தரவிற்கான சிம் ஐத் தேர்வுசெய்யவும்."</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"சிம் பின் குறியீடு தவறானது, உங்கள் சாதனத்தைத் திறக்க, உங்கள் மொபைல் நிறுவனத்தைத் தொடர்புகொள்ள வேண்டும்."</string>
   <plurals name="wrong_pin_code">
-    <item quantity="one" msgid="4840607930166101114">"SIM PIN குறியீடு தவறானது, உங்கள் சாதனத்தைத் திறக்க, உங்கள் மொபைல் நிறுவனத்தைத் தொடர்புகொள்ளும் முன், மேலும் <xliff:g id="NUMBER">%d</xliff:g> முறை முயற்சிக்கலாம்."</item>
-    <item quantity="other" msgid="77103619544346451">"SIM PIN குறியீடு தவறானது, மேலும் <xliff:g id="NUMBER">%d</xliff:g> முறை முயற்சிக்கலாம்."</item>
+    <item quantity="one" msgid="4840607930166101114">"சிம் பின் குறியீடு தவறானது, உங்கள் சாதனத்தைத் திறக்க, உங்கள் மொபைல் நிறுவனத்தைத் தொடர்புகொள்ளும் முன், மேலும் <xliff:g id="NUMBER">%d</xliff:g> முறை முயற்சிக்கலாம்."</item>
+    <item quantity="other" msgid="77103619544346451">"சிம் பின் குறியீடு தவறானது, மேலும் <xliff:g id="NUMBER">%d</xliff:g> முறை முயற்சிக்கலாம்."</item>
   </plurals>
-    <string name="pin_failed" msgid="1848423634948587645">"SIM PIN செயல்பாடு தோல்வி!"</string>
+    <string name="pin_failed" msgid="1848423634948587645">"சிம் பின் செயல்பாடு தோல்வி!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"டேப்லெட் நிலை"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"மொபைலின் நிலை"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"முறைமை புதுப்பிப்புகள்"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"System Clear சேவை இல்லை என்பதால் மீட்டமைவைச் செயற்படுத்தப்படவில்லை."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"மீட்டமைக்கவா?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"இவருக்கு ஆரம்பநிலை மீட்டமைவு இல்லை"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"அழிக்கிறது"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"காத்திருக்கவும்..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB சேமிப்பிடத்தை அழி"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD கார்டை அழி"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB சேமிப்பிடத்தில் உள்ள எல்லா தரவையும் அழிக்கவும்"</string>
@@ -1096,9 +1095,9 @@
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"வைஃபை அசிஸ்டண்டை மாற்றவா?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"நெட்வொர்க் இணைப்புகளை நிர்வகிக்க, <xliff:g id="CURRENT_APP">%2$s</xliff:g>க்குப் பதிலாக <xliff:g id="NEW_APP">%1$s</xliff:g>ஐப் பயன்படுத்தவா?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"நெட்வொர்க் இணைப்புகளை நிர்வகிக்க <xliff:g id="NEW_APP">%s</xliff:g>ஐப் பயன்படுத்தவா?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"அறியப்படாத SIM மொபைல் நிறுவனம்"</string>
+    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"அறியப்படாத சிம் மொபைல் நிறுவனம்"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s இடம் அறிந்த வழங்குதல் இணையதளம் இல்லை"</string>
-    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM கார்டைச் செருகி மீண்டும் தொடங்கவும்"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"சிம் கார்டைச் செருகி மீண்டும் தொடங்கவும்"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"இணையத்துடன் இணைக்கவும்"</string>
     <string name="location_title" msgid="1029961368397484576">"எனது இருப்பிடம்"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"பயன்முறை"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"பதிப்புரிமை"</string>
     <string name="license_title" msgid="1990487604356037871">"உரிமம்"</string>
     <string name="terms_title" msgid="7697580845616764642">"விதிமுறைகளும் நிபந்தனைகளும்"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ஓப்பன் சோர்ஸ் உரிமங்கள்"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"உரிமங்களை ஏற்றுவதில் சிக்கல் உள்ளது."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ஏற்றுகிறது..."</string>
@@ -1147,19 +1150,19 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ஏற்றுகிறது..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"உங்கள் கடவுச்சொல்லைத் தேர்வுசெய்க"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"உங்கள் வடிவத்தைத் தேர்வுசெய்யவும்"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"உங்கள் PIN ஐத் தேர்வுசெய்யவும்"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"உங்கள் பின் ஐத் தேர்வுசெய்யவும்"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"உங்கள் கடவுச்சொல்லை உறுதிப்படுத்தவும்"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"உங்கள் வடிவத்தை உறுதிப்படுத்தவும்"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"உங்கள் PIN ஐ உறுதிசெய்யவும்"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"உங்கள் பின்னை உறுதிசெய்யவும்"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"கடவுச்சொற்கள் பொருந்தவில்லை"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PINகள் பொருந்தவில்லை"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"திறப்பதற்கான தேர்வு"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"கடவுச்சொல் அமைக்கப்பட்டது"</string>
-    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN அமைக்கப்பட்டது"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"பின் அமைக்கப்பட்டது"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"வடிவம் அமைக்கப்பட்டது"</string>
     <string name="lock_settings_title" msgid="335025124489630932">"திரைப் பாதுகாப்பு"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"திறக்கும் வடிவத்தை மாற்று"</string>
-    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"திறப்பதற்கான PIN ஐ மாற்று"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"திறப்பதற்கான பின்னை மாற்று"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"சேமித்த வடிவத்தை உறுதிப்படுத்தவும்"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"மீண்டும் முயற்சிக்கவும்:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"திறப்பதற்கான வடிவத்தை வரைக"</string>
@@ -1647,7 +1650,7 @@
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"வைஃபை இயங்குகிறது"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"டேப்லெட்"</string>
-    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"மொபைல்"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"ஃபோன்"</string>
     <string name="usage_type_data_send" msgid="8971710128438365919">"அனுப்பப்பட்ட மொபைல் தொகுப்புகள்"</string>
     <string name="usage_type_data_recv" msgid="5468564329333954445">"பெறப்பட்ட மொபைல் தொகுப்புகள்"</string>
     <string name="usage_type_radio_active" msgid="1732647857619420121">"மொபைல் ரேடியோ செயலில் உள்ளது"</string>
@@ -1834,11 +1837,10 @@
     <string name="credentials_erased" msgid="2907836028586342969">"நற்சான்றிதழ் சேமிப்பிடம் அழிக்கப்பட்டது."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"நற்சான்று சேமிப்பிடத்தை அழிக்க முடியாது."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"நற்சான்று சேமிப்பிடம் இயக்கப்பட்டது."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"நீங்கள் நற்சான்று சேமிப்பிடத்தைப் பயன்படுத்துவதற்கு முன் பூட்டு திரையின் PIN அல்லது கடவுச்சொல்லை அமைக்க வேண்டும்."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"நீங்கள் நற்சான்று சேமிப்பிடத்தைப் பயன்படுத்துவதற்கு முன் பூட்டு திரையின் பின் அல்லது கடவுச்சொல்லை அமைக்க வேண்டும்."</string>
     <string name="usage_access_title" msgid="332333405495457839">"பயன்பாட்டு அணுகல் உள்ள ஆப்ஸ்"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"அணுகலை அனுமதிக்கவா?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"அணுக அனுமதித்தால், பயன்பாடுகளை எத்தனை முறைப் பயன்படுத்துகிறீர்கள் என்பது போன்ற உங்கள் சாதனத்தில் உள்ள பயன்பாடுகள் குறித்த பொதுவான தகவலை இதனால் பார்க்க முடியும்."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"அவசர அழைப்பு டோன்"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"அவசர அழைப்பு இயக்கப்பட்டிருக்கும்போது நடத்தையை அமை"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"காப்புப் பிரதி &amp; மீட்டமைவு"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"பின்புலச் செயல்முறை வரம்பு"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"எல்லா ANRகளையும் காட்டு"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"பின்புலப் பயன்பாடுகளுக்குப் பயன்பாடு பதிலளிக்கவில்லை என்ற உரையாடலைக் காட்டு"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"இந்தச் செயல்பாட்டிற்காக GoogleSettings பயன்பாட்டைப் பயன்படுத்தவும்"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView நெட்வொர்க் பயன்பாட்டைக் குறை"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Google சுருக்கச் சேவையகங்கள் மூலமாக WebView இணைப்புகளை ப்ராக்ஸி செய்து நெட்வொர்க் பயன்பாட்டைக் குறைக்கும்"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"தரவுப் பயன்பாடு"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"பயன்பாட்டின் தரவுப் பயன்பாடு"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"சாதனத்திலிருந்து மொபைல் நிறுவனத்தின் தரவு கணக்கிடல் மாறுபடலாம்."</string>
@@ -2049,7 +2049,7 @@
     <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"ஈதர்நெட் பயன்பாட்டை மறை"</string>
     <string name="data_usage_menu_metered" msgid="6235119991372755026">"நெட்வொர்க் கட்டுப்பாடுகள்"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"தரவைத் தானாக ஒத்திசை"</string>
-    <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"SIM கார்டுகள்"</string>
+    <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"சிம் கார்டுகள்"</string>
     <string name="data_usage_menu_cellular_networks" msgid="5243515735055652279">"செல்லுலார் நெட்வொர்க்குகள்"</string>
     <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"தரவைத் தானாக ஒத்திசை"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"தனிப்பட்ட தரவைத் தானாக ஒத்திசை"</string>
@@ -2256,7 +2256,7 @@
     <string name="nfc_payment_set_default_instead_of" msgid="3803693771001226795">"தட்டி &amp; கட்டணம் செலுத்தும்போது <xliff:g id="APP_1">%2$s</xliff:g> க்குப் பதிலாக எப்போதும் <xliff:g id="APP_0">%1$s</xliff:g> ஐப் பயன்படுத்தவா?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"கட்டுப்பாடுகள்"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"வரையறைகளை அகற்று"</string>
-    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN ஐ மாற்று"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"பின்னை மாற்று"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"அறிவிப்புகளைக் காட்டு"</string>
     <string name="help_label" msgid="6886837949306318591">"உதவி &amp; கருத்து"</string>
     <string name="user_account_title" msgid="1127193807312271167">"உள்ளடக்கத்திற்கான கணக்கு"</string>
@@ -2280,7 +2280,7 @@
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"குரல் மற்றும் தகவல்தொடர்புகளை மேம்படுத்த LTE தரவைப் பயன்படுத்தவும் (பரிந்துரைக்கப்பட்டது)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"தேர்ந்தெடுத்த நெட்வொர்க் வகை"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (பரிந்துரைக்கப்பட்டது)"</string>
-    <string name="work_sim_title" msgid="4843322164662606891">"பணியிட SIM"</string>
+    <string name="work_sim_title" msgid="4843322164662606891">"பணியிட சிம்"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"பயன்பாடு &amp; உள்ளடக்க அணுகல்"</string>
     <string name="user_rename" msgid="8523499513614655279">"மறுபெயரிடுக"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"பயன்பாட்டின் வரையறைகளை அமை"</string>
@@ -2303,31 +2303,31 @@
     <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>
-    <string name="sim_setup_wizard_title" msgid="1732682852692274928">"SIM கார்டுகள்"</string>
-    <string name="sim_settings_title" msgid="6822745211458959756">"SIM கார்டுகள்"</string>
+    <string name="sim_setup_wizard_title" msgid="1732682852692274928">"சிம் கார்டுகள்"</string>
+    <string name="sim_settings_title" msgid="6822745211458959756">"சிம் கார்டுகள்"</string>
     <string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
-    <string name="sim_cards_changed_message" msgid="7900721153345139783">"SIM கார்டுகள் மாற்றப்பட்டன"</string>
+    <string name="sim_cards_changed_message" msgid="7900721153345139783">"சிம் கார்டுகள் மாற்றப்பட்டன"</string>
     <string name="sim_cards_changed_message_summary" msgid="5452545583546944683">"செயல்களை அமைக்கத் தொடவும்"</string>
     <string name="sim_cellular_data_unavailable" msgid="9018555543451203035">"செல்லுலார் தரவு கிடைக்கவில்லை"</string>
-    <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"தரவு SIM ஐத் தேர்வுசெய்ய தொடவும்"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"தரவு சிம் ஐத் தேர்வுசெய்ய தொடவும்"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"அழைப்புகளுக்கு எப்போதும் இதை பயன்படுத்து"</string>
-    <string name="sim_select_card" msgid="211285163525563293">"SIM கார்டைத் தேர்வுசெய்யவும்"</string>
-    <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
-    <string name="sim_slot_empty" msgid="8964505511911854688">"SIM இல்லை"</string>
-    <string name="sim_editor_name" msgid="1722945976676142029">"SIM பெயர்"</string>
-    <string name="sim_editor_title" msgid="6364331907415443358">"SIM கார்டு"</string>
+    <string name="sim_select_card" msgid="211285163525563293">"சிம் கார்டைத் தேர்வுசெய்யவும்"</string>
+    <string name="sim_card_number_title" msgid="7845379943474336488">"சிம் <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
+    <string name="sim_slot_empty" msgid="8964505511911854688">"சிம் இல்லை"</string>
+    <string name="sim_editor_name" msgid="1722945976676142029">"சிம் பெயர்"</string>
+    <string name="sim_editor_title" msgid="6364331907415443358">"சிம் கார்டு"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"சேவை வழங்குநர்"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"எண்"</string>
-    <string name="sim_editor_color" msgid="2542605938562414355">"SIM வண்ணம்"</string>
+    <string name="sim_editor_color" msgid="2542605938562414355">"சிம் வண்ணம்"</string>
     <string name="sim_editor_num_format" msgid="4681231191387098783">"எண்களின் வடிவம்"</string>
-    <string name="sim_card_select_title" msgid="6668492557519243456">"SIM கார்டைத் தேர்ந்தெடுக்கவும்"</string>
+    <string name="sim_card_select_title" msgid="6668492557519243456">"சிம் கார்டைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="color_orange" msgid="4417567658855022517">"இளஞ்சிவப்பு"</string>
     <string name="color_purple" msgid="3888532466427762504">"ஊதா"</string>
-    <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM கார்டுகள் செருகப்படவில்லை"</string>
-    <string name="sim_status_title" msgid="6744870675182447160">"SIM நிலை"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM தொடர்பான தகவல்"</string>
-    <string name="sim_call_back_title" msgid="5181549885999280334">"இயல்புநிலை SIM இலிருந்து திருப்பி அழை"</string>
-    <string name="sim_outgoing_call_title" msgid="1019763076116874255">"வெளிச்செல்லும் அழைப்புகளுக்கான SIM"</string>
+    <string name="sim_no_inserted_msg" msgid="210316755353227087">"சிம் கார்டுகள் செருகப்படவில்லை"</string>
+    <string name="sim_status_title" msgid="6744870675182447160">"சிம் நிலை"</string>
+    <string name="sim_status_summary" msgid="4934558018015161369">"சிம் தொடர்பான தகவல்"</string>
+    <string name="sim_call_back_title" msgid="5181549885999280334">"இயல்புநிலை சிம் இலிருந்து திருப்பி அழை"</string>
+    <string name="sim_outgoing_call_title" msgid="1019763076116874255">"வெளிச்செல்லும் அழைப்புகளுக்கான சிம்"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"பிற அழைப்பு அமைப்பு"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"தேர்ந்தெடுத்த நெட்வொர்க்கை துண்டித்தல்"</string>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"நெட்வொர்க் பெயர் அலைபரப்பை முடக்கு"</string>
@@ -2466,11 +2466,16 @@
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"பயன்பாட்டு அறிவிப்புகள்"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"அறிவிப்பு அமைப்பு"</string>
     <string name="device_feedback" msgid="3238056036766293294">"சாதனம் பற்றி கருத்தை அனுப்பு"</string>
-    <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"நிர்வாகி PIN ஐ உள்ளிடவும்"</string>
+    <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"நிர்வாகி பின்னை உள்ளிடவும்"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"இயக்கு"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"முடக்கு"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"திரையைப் பொருத்துதல்"</string>
     <string name="screen_pinning_description" msgid="3022868253807792488">"இந்த அமைப்பு இயக்கப்படும்போது, நடப்பு திரை தோன்றும் நிலையிலேயே சாதனத்தை வைக்கலாம்.\n\nதிரையைப் பொருத்த:\n\n1. இந்த அமைப்பை இயக்கவும்.\n\n2. ஒரு பயன்பாட்டைத் திறக்கவும்.\n\n3. சமீபத்தியவை பொத்தானைத் தொடவும்.\n\n4. பொருத்து ஐகானைத் தொடவும்."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"பணி சுயவிவரம்"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(சோதனை முயற்சி)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"சாதனத்தைச் சுழற்றும் போது"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"திரை உள்ளடக்கத்தைச் சுழற்று"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"நீளவாக்கில் வை"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"அகலவாக்கில் வை"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"தற்போதைய திசையமைப்பில் வை"</string>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 50ed85b..a7b9e2c 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"జత చేయడానికి అభ్యర్థన"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>తో జత చేయడానికి తాకండి."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"స్వీకరించబడిన ఫైల్‌లను చూపు"</string>
-    <string name="device_picker" msgid="8398232791303186677">"బ్లూటూత్ పరికర ఎంపిక"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"బ్లూటూత్ అనుమతి అభ్యర్థన"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"అనువర్తనం బ్లూటూత్‌ను ప్రారంభించాలనుకుంటుంది."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"అనువర్తనం మీ టాబ్లెట్‌ను ఇతర బ్లూటూత్ పరికరాలకు <xliff:g id="TIMEOUT">%1$d</xliff:g> సెకన్లు కనిపించేలా చేయాలనుకుంటుంది."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"సిస్టమ్ క్లియర్ సేవ అందుబాటులో లేనందున రీసెట్ చేయడం అమలు కాలేదు."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"రీసెట్ చేయాలా?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ఈ వినియోగదారుకి ఫ్యాక్టరీ రీసెట్ అందుబాటులో లేదు"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"ఎరేజ్ చేస్తోంది"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"దయచేసి వేచి ఉండండి..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB నిల్వను ఎరేజ్ చేయి"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD కార్డుని ఎరేజ్ చేయి"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB నిల్వలోని మొత్తం డేటాను ఎరేజ్ చేస్తుంది"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"కాపీరైట్"</string>
     <string name="license_title" msgid="1990487604356037871">"లైసెన్స్"</string>
     <string name="terms_title" msgid="7697580845616764642">"నిబంధనలు మరియు షరతులు"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ఓపెన్ సోర్స్ లైసెన్స్‌లు"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"లైసెన్స్‌లను లోడ్ చేయడంలో సమస్య ఉంది."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"లోడ్ చేస్తోంది…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"మీరు ఆధారాల నిల్వను ఉపయోగించడానికి ముందు లాక్ స్క్రీన్ PIN లేదా పాస్‌వర్డ్‌ను సెట్ చేయాల్సి ఉంటుంది."</string>
     <string name="usage_access_title" msgid="332333405495457839">"వినియోగ ప్రాప్యత గల అనువర్తనాలు"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"ప్రాప్యతను అనుమతించాలా?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"మీరు ప్రాప్యతను అనుమతిస్తే, మీ పరికరంలో ఉన్న అనువర్తనాల గురించి సాధారణ సమాచారాన్ని అనగా మీరు వాటిని ఎంత తరచుగా ఉపయోగిస్తారు వంటి వివరాలను ఈ అనువర్తనం తెలుసుకోగలదు."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"అత్యవసర టోన్"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"అత్యవసర కాల్ వచ్చినప్పుడు చేయాల్సిన విధిని సెట్ చేయండి"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"బ్యాకప్ &amp; రీసెట్"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"నేపథ్య ప్రాసెస్ పరిమితి"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"అన్ని ANRలను చూపు"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"నేపథ్య అనువర్తనాల కోసం అనువర్తనం ప్రతిస్పందించడం లేదు డైలాగ్‌ను చూపు"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"దయచేసి ఈ చర్య కోసం GoogleSettings అనువర్తనాన్ని ఉపయోగించండి"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView నెట్‌వర్క్ వినియోగాన్ని తగ్గించండి"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"WebView కనెక్షన్‌లను Google కుదింపు సర్వర్‌ల గుండా బదిలీ చేయడం ద్వారా నెట్‌వర్క్ వినియోగాన్ని తగ్గించండి"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"డేటా వినియోగం"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"అనువర్తన డేటా వినియోగం"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"క్యారియర్ డేటా అకౌంటింగ్ మీ పరికరాన్ని బట్టి మారుతుంది."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"ఈ సెట్టింగ్‌ని ఆన్ చేసినప్పుడు, మీరు పరికరాన్ని ప్రస్తుత స్క్రీన్ వీక్షణలో ఉండే స్థితిలో ఉంచవచ్చు.\n\nస్క్రీన్‌ను పిన్ చేయడానికి ఇలా చేయండి:\n\n1. ఈ సెట్టింగ్‌ను ఆన్ చేయండి.\n\n2. అనువర్తనాన్ని తెరవండి.\n\n3. ఇటీవలివి బటన్‌ను తాకండి.\n\n4. పిన్ చిహ్నాన్ని తాకండి."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"కార్యాలయ ప్రొఫైల్‌"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ప్రయోగాత్మకం)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"పరికరాన్ని తిప్పినప్పుడు"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"స్క్రీన్‌లోని కంటెంట్‌లను తిప్పు"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"పోర్ట్రెయిట్ వీక్షణలో ఉంచు"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ల్యాండ్‌స్కేప్ వీక్షణలో ఉంచు"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ప్రస్తుత దృగ్విన్యాసంలో ఉంచు"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 6a03072..ea832e7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"แตะเพื่อจับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"แสดงไฟล์ที่ได้รับ"</string>
-    <string name="device_picker" msgid="8398232791303186677">"ตัวเลือกอุปกรณ์บลูทูธ"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"คำขออนุญาตใช้บลูทูธ"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"แอปพลิเคชันต้องการเปิดบลูทูธ"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"ไม่มีการรีเซ็ตเนื่องจากบริการล้างข้อมูลระบบไม่พร้อมใช้งาน"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"รีเซ็ตหรือไม่"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"การรีเซ็ตเป็นค่าจากโรงงานไม่สามารถใช้ได้สำหรับผู้ใช้รายนี้"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"กำลังลบ"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"โปรดรอสักครู่..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"ลบที่เก็บข้อมูล USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"ลบการ์ด SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"ลบข้อมูลทั้งหมดในที่เก็บข้อมูล USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"ลิขสิทธิ์"</string>
     <string name="license_title" msgid="1990487604356037871">"สัญญาอนุญาต"</string>
     <string name="terms_title" msgid="7697580845616764642">"ข้อกำหนดในการให้บริการ"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"สัญญาอนุญาตสำหรับโอเพนซอร์ส"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"พบปัญหาในการโหลดสัญญาอนุญาต"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"กำลังโหลด…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"คุณต้องตั้ง PIN หรือรหัสผ่านสำหรับการล็อกหน้าจอก่อนจึงจะสามารถใช้ที่เก็บข้อมูลรับรองได้"</string>
     <string name="usage_access_title" msgid="332333405495457839">"แอปที่มีสิทธิ์เข้าถึงการใช้งาน"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"อนุญาตให้เข้าถึงไหม"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"หากคุณอนุญาตให้เข้าถึง แอปนี้จะสามารถดูข้อมูลทั่วไปเกี่ยวกับแอปต่างๆ ในอุปกรณ์ของคุณ เช่น ความถี่ในการใช้แอป"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"โทนเสียงฉุกเฉิน"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ตั้งค่าการทำงานเมื่อมีการโทรหาหมายเลขฉุกเฉิน"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"การสำรองข้อมูลและการรีเซ็ต"</string>
@@ -2025,12 +2027,10 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"ขีดจำกัดกระบวนการพื้นหลัง"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"แสดง ANR ทั้งหมด"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"แสดงหน้าต่างแอปไม่ตอบสนอง สำหรับแอปพื้นหลัง"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"โปรดใช้แอปการตั้งค่า Google สำหรับการดำเนินการนี้"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"ลดการใช้เครือข่าย WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
-    <string name="data_usage_summary_title" msgid="3804110657238092929">"การใช้ข้อมูล"</string>
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"ลดการใช้เครือข่ายโดยใช้พร็อกซีเชื่อมต่อ WebView ผ่านเซิร์ฟเวอร์การบีบอัดของ Google"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"การใช้อินเทอร์เน็ต"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"การใช้ข้อมูลแอป"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"การทำบัญชีข้อมูลผู้ให้บริการอาจแตกต่างจากอุปกรณ์ของคุณ"</string>
     <string name="data_usage_app" msgid="4970478397515423303">"การใช้งานแอป"</string>
@@ -2275,7 +2275,7 @@
     <skip />
     <string name="cell_broadcast_settings" msgid="2451014351355183338">"การเผยแพร่ข้อมูลฉุกเฉิน"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ผู้ให้บริการเครือข่าย"</string>
-    <string name="access_point_names" msgid="1381602020438634481">"ชื่อจุดเข้าใช้งาน"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"Access point names"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"โหมด 4G LTE ที่ปรับปรุงแล้ว"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"ใช้ข้อมูล LTE เพื่อปรับปรุงเสียงและการสื่อสาร (แนะนำ)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"ประเภทเครือข่ายที่ต้องการ"</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"เมื่อเปิดการตั้งค่านี้ คุณสามารถตั้งค่าอุปกรณ์เป็นสถานะที่เปิดหน้าจอปัจจุบันค้างไว้\n\nวิธีตรึงหน้าจอ:\n\n1. เปิดการตั้งค่านี้\n\n2. เปิดแอป\n\n3. แตะปุ่ม \"ล่าสุด\"\n\n4. แตะไอคอนรูปหมุด"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"โปรไฟล์งาน"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ทดลอง)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"เมื่อหมุนอุปกรณ์"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"หมุนเนื้อหาของหน้าจอ"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ใช้มุมมองแนวตั้ง"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ใช้มุมมองแนวนอน"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ใช้การวางแนวเดิม"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index e454aa7..115ad53 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Kahilingan sa pagpares"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Pindutin upang ipares sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ipakita ang mga natanggap na file"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Tagapili ng device ng Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Kahilingan sa pahintulot ng bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Gustong i-on ng isang app ang Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong tablet sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Walang isinagawang pag-reset dahil hindi available ang serbisyong System Clear."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"I-reset?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Hindi available ang factory reset para sa user na ito"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Binubura"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Mangyaring maghintay..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Burahin imbakan na USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Burahin ang SD card"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Bubura lahat data USB storage"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensya"</string>
     <string name="terms_title" msgid="7697580845616764642">"Mga Tuntunin at kundisyon"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Mga lisensya ng bukas na pinagmumulan"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"May problema sa pag-load ng mga lisensya."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Naglo-load…"</string>
@@ -1200,7 +1203,7 @@
     <string name="advanced_settings" msgid="1777249286757067969">"Mga advanced na setting"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Paganahin ang higit pang mga pagpipilian sa mga setting"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Impormasyon ng app"</string>
-    <string name="storage_label" msgid="8700867073480107253">"Imbakan"</string>
+    <string name="storage_label" msgid="8700867073480107253">"Storage"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Paglunsad bilang default"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Mga Default"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Pagiging tugma ng screen"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kailangan mong magtakda ng PIN o password ng lock screen bago mo magamit ang storage ng kredensyal."</string>
     <string name="usage_access_title" msgid="332333405495457839">"App na may access sa paggamit"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Payagan ang access?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Kung bibigyang-daan mo ang pag-access, makakatingin ng pangkalahatang impormasyon ang app na ito tungkol sa mga app sa iyong device, gaya ng kung gaano kadalas mong ginagamit ang mga ito."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tonong pang-emergency"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Itakda ang pag-uugali kapag naganap ang isang pang-emergency na tawag"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"I-backup &amp; i-reset"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limitasyon ng proseso sa background"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Ipakita ang lahat ng ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Ipakita dialog Di Tumugon App para background apps"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Pakigamit ang GoogleSettings app para sa operasyong ito"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Bawas WebView Network Usage"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Bawasan ang paggamit sa network sa pamamagitan ng pagpo-proxy ng mga koneksyon sa WebView sa pamamagitan ng mga compression server ng Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Paggamit ng data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Paggamit ng data ng app"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ang accounting ng data ng carrier ay maaaring naiiba sa iyong device."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Kapag naka-on ang setting na ito, mailalagay mo ang device sa isang estado kung saan palaging naka-on ang kasalukuyang screen na tinitingnan.\n\nUpang mag-pin ng screen:\n\n1. I-on ang setting na ito.\n\n2. Magbukas ng isang app.\n\n3. Pindutin ang button na Mga Kamakailang Ginamit.\n\n4. Pindutin ang icon na pin."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Profile sa trabaho"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Pang-eksperimento)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Kapag inikot ang device"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ikutin ang mga nilalaman ng screen"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Manatili sa portrait na view"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Manatili sa landscape na view"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manatili sa kasalukuyang oryentasyon"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 461f77d..6ef15f0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Eşleşme isteği"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleştirmek için dokunun."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Alınan dosyaları göster"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth cihaz seçici"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth izin isteği"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Bir uygulama Bluetooth\'u açmak istiyor."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Bir uygulama, tabletinizi <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazlarına görünebilir yapmak istiyor."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Sistem Temizleme hizmeti kullanılamadığından sıfırlama yapılmadı."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Sıfırlansın mı?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Bu kullanıcı için fabrika ayarlarına sıfırlama işlevi kullanılamıyor"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Siliniyor"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Lütfen bekleyin..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB belleği sil"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD kartı sil"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB bellekteki tüm verlr siler"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Telif Hakkı"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisans"</string>
     <string name="terms_title" msgid="7697580845616764642">"Şartlar ve koşullar"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Açık kaynak lisansları"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Lisanslar yüklenirken bir sorun oluştu."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Yükleniyor…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kimlik bilgileri depolamasını kullanabilmek için öncelikle bir ekran PIN\'i veya şifre ayarlamanız gerekir."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Kullanım erişimi olan uygulamalar"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Erişim izni verilsin mi?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Erişime izin verirseniz bu uygulama, cihazınızdaki uygulamalarla ilgili genel bilgileri (ör. uygulamaları ne sıklıkta kullandığınızı) görüntüleyebilir."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Acil sesi"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Acil çağrı yapıldığında nasıl işlev göreceğini ayarlayın"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Yedekle ve sıfırla"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Arka plan işlem sınırı"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Tüm ANR\'leri göster"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Arka plan uygulamalar için Uygulama Yanıt Vermiyor mesajını göster"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Bu işlem için lütfen Google Ayarları uygulamasını kullanın"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView Ağ Kullanımını Azalt"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"WebView bağlantılarını Google sıkıştırma sunucuları üzerinden proxy yaparak ağ kullanımını azaltın"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Veri kullanımı"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uygulama veri kullanımı"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatör verilerinin hesaplanması, cihazınızdan farklı olabilir."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Bu ayar açık olduğunda cihazı, mevcut ekranın görünür olarak kaldığı bir duruma geçirebilirsiniz.\n\nEkranı sabitlemek için:\n\n1. Bu ayarı açın.\n\n2. Uygulamayı açın.\n\n3. Son Kullanılanlar düğmesine dokunun.\n\n4. Raptiye simgesine dokunun."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"İş profili"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Deneysel)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Cihaz döndürüldüğünde"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ekranın içeriğini döndür"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Dikey görünümde kal"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Yatay görünümde kal"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Geçerli yönde kal"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b620fe1..78a9b44 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Запит на ств. пари"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Торкніться, щоб створити пару з пристроєм <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показати отримані файли"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Інструмент вибору пристрою Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запит на дозвіл Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Програма хоче ввімкнути Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Програма хоче зробити ваш планшетний ПК видимим для інших пристроїв Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Скидання не виконано, оскільки служба очищення системи не доступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Скинути?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Цей користувач не може відновити заводські налаштування"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Стирання"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Зачекайте…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Очистити носій USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Очист. карту SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Видаляє всі дані на носії USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Автор. право"</string>
     <string name="license_title" msgid="1990487604356037871">"Ліцензія"</string>
     <string name="terms_title" msgid="7697580845616764642">"Заг. положення й умови"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Ліцензії з відкр. кодом"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Під час завантаж. ліцензій виникла пробл."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Завант-ня…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Щоб використовувати сховище облікових даних, потрібно встановити PIN-код або пароль для блокування екрана."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Додатки з доступом до даних"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Надати доступ?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Якщо ви надасте доступ, цей додаток отримуватиме загальну інформацію про додатки на вашому пристрої, зокрема про частоту їх використання."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Аварійний сингал"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Устан. поведінку при розміщ. аварійного виклику"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Резервне копіювання та скидання"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Обмеження фон. процесів"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Показати всі вікна ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Показ.вікно \"Прог. не відповідає\" для фонов.прогр."</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Виконайте цю дію за допомогою додатка Налаштування Google"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView: зменш.викор.мережі"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Зменшити використання мережі, надсилаючи з’єднання WebView через сервери стискання Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Використання даних"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Використ. даних додатком"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ваш оператор може по-іншому облікувати дані."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Якщо це налаштування ввімкнено, на пристрої можна закріпити поточний екран.\n\nДля цього виконайте вказані нижче дії.\n\n1. Увімкніть це налаштування.\n\n2. Відкрийте додаток.\n\n3. Торкніться кнопки \"Останні\".\n\n4. Торкніться значка шпильки."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Робочий профіль"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментальна функція)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Коли пристрій обертають"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Обертати вміст екрана"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Залишити книжкову орієнтацію"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Залишити альбомну орієнтацію"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Залишити поточну орієнтацію"</string>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index d95f53b..68b20ff 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"جوڑا بنانے کی درخواست"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کے ساتھ جوڑا بنانے کیلئے ٹچ کریں۔"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"موصولہ فائلیں دکھائیں"</string>
-    <string name="device_picker" msgid="8398232791303186677">"بلوٹوتھ آلہ کا منتخب کنندہ"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"بلوٹوتھ اجازت کی درخواست"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"ایک ایپ بلوٹوتھ آن کرنا چاہتی ہے۔"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"ایک ایپ <xliff:g id="TIMEOUT">%1$d</xliff:g> سیکنڈ کیلئے آپ کے ٹیبلٹ کو دیگر بلوٹوتھ آلات پر مرئی بنانا چاہتی ہے۔"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"کوئی ری سیٹ انجام نہیں دیا گیا کیونکہ سسٹم صاف کریں سروس دستیاب نہیں ہے۔"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"دوبارہ ترتیب دیں؟"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"اس صارف کیلئے فیکٹری ری سیٹ دستیاب نہیں ہے"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"صاف کیا جا رہا ہے"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"براہ کرم انتظار کریں…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"‏USB اسٹوریج کو حذف کریں"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"‏SD کارڈ حذف کریں"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"‏USB سٹوریج میں سبھی ڈیٹا حذف کر دیتا ہے"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"کاپی رائٹ"</string>
     <string name="license_title" msgid="1990487604356037871">"لائسنس"</string>
     <string name="terms_title" msgid="7697580845616764642">"شرائط و ضوابط"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"اوپن سورس لائسنسز"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"لائسنسز لوڈ کرنے میں ایک مسئلہ ہے۔"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"لوڈ ہو رہا ہے…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"‏اس سے پہلے کہ آپ اسنادات اسٹوریج کا استعمال کر سکیں آپ کو اسکرین مقفل کرنے کا ایک PIN یا پاس ورڈ سیٹ کرنا ہوگا۔"</string>
     <string name="usage_access_title" msgid="332333405495457839">"استعمال تک رسائی والی ایپس"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"رسائی کی اجازت دیں؟"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"اگر آپ رسائی کی اجازت دیتے ہیں تو یہ ایپ آپ کے آلہ پر موجود ایپس کے بارے میں عمومی معلومات دیکھ سکتی ہے، جیسے آپ انہیں کتنی بار استعمال کرتے ہیں۔"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"ہنگامی ٹون"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ہنگامی کال کرتے وقت برتاؤ سیٹ کریں"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"بیک اپ لیں اور دوبارہ ترتیب دیں"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"پس منظر پروسیس کی حد"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"‏سبھی ANRs کو دکھائیں"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"پس منظر کی ایپس کیلئے ایپ جواب نہیں دے رہی ہے ڈائلاگ دکھائیں"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"‏براہ کرم اس کارروائی کیلئے Google ترتیبات ایپ کا استعمال کریں"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"‏WebView نیٹ ورک استعمال کم کریں"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"‏WebView کنکشنز کو Google کمپریشن سرورز کے ذریعے پراکسی کر کے نیٹ ورک کا استعمال کم کریں"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ڈیٹا کا استعمال"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ایپ کے ڈیٹا کا استعمال"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"کیریئر ڈیٹا کا حساب آپ کے آلہ سے مختلف ہو سکتا ہے۔"</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"یہ ترتیب آن ہونے پر، آپ آلہ کو ایسی حالت میں رکھ سکتے ہیں جو حالیہ اسکرین کو منظر میں رکھتی ہے\n\nکسی اسکرین کو پن کرنے کیلئے:\n\n1۔ اس ترتیب کو آن کریں۔\n\n2۔ ایک ایپ کھولیں۔\n\n3۔ حالیہ بٹن کو ٹچ کریں۔\n\n4۔ پن کے آئیکن کو ٹچ کریں۔"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"دفتر کا پروفائل"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(تجرباتی)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"جب آلہ گھمایا جائے"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"اسکرین کے موادوں کو گھمائیں"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"پورٹریٹ منظر میں رہیں"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"لینڈ اسکیپ منظر میں رہیں"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"موجودہ سمت بندی میں رہیں"</string>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 7f3f9f6..563bb42 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Biriktirish so‘rovi"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ga o‘zaro bog‘lanish uchun uni tegib tanlang."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Qabul qilingan fayllarni ko‘rsatish"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Bluetooth qurilma tanlagichi"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth ruxsati so‘rovi"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Ilova Bluetooth‘ni yoqmoqchi."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Ilova planshetingizni boshqa Bluetooth qurilmalariga <xliff:g id="TIMEOUT">%1$d</xliff:g> soniya davomida ko‘rinarli qilmoqchi."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Dastlabki sozlamalarni qaytarib bo\'lmadi, chunki Tizimni tozalash xizmati javob bermayapti."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Tozalanilsinmi?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Ushbu foydalanuvchiga sozlamalarni zavod holatiga qaytarishga ruxsat berilmagan"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"O‘chirilmoqda"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Iltimos, kuting…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB xotirani tozalash"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD kartani tozalash"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB xotiradagi barcha ma‘lumotlarni o‘chiradi"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Mualliflik huquqi"</string>
     <string name="license_title" msgid="1990487604356037871">"Litsenziya"</string>
     <string name="terms_title" msgid="7697580845616764642">"Foydalanish shartlari"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Erkin va ochiq kodli litsenziyalar"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Litsenziyalarni yuklashda muammo yuz berdi."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Yuklanmoqda…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Hisob ma‘lumotlarini saqlash joyidan foydalana olish uchun, avval ekranda qulf PIN kodi yoki parolni o‘rnatish lozim."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Kirish huquqi bor ilovalar"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Ruxsat berilsinmi?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Ushbu ilovaga ruxsat bersangiz, u qurilmangizdagi ilovalar haqida umumiy ma’lumotlarni ko‘rishi mumkin. Masalan, ulardan qanchalik foydalanishingiz haqidagi ma’lumotlarni."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Favqulodda vaziyat tovushi"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Favqulodda qo‘ng‘iroq uchun xususiyat o‘rnatish"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Zahiralash &amp; qayta tiklash"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Fondagi jarayon cheklovi"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Barcha ANRlar"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Fondagi ilovalar uchun Barcha javob bermayotgan ilovalarni ko‘rsatish"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Ushbu amalni bajarish uchun Google sozlamalari ilovasidan foydalaning"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"WebView trafigini kamaytirish"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"WebView ulanishlarini Google’ning trafikni siqish serverlari yordamida o‘tkazish orqali tarmoqdan foydalanish trafigini qisqartiring"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Trafik sarfi"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ilovaning int-dan foyd-shi"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Aloqa operatorining hisob-kitoblari qurilmangiznikidan farq qilishi mumkin."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Agar ushbu sozlama yoqilsa, qurilmani joriy ekran ko‘rinib turadigan qilib sozlashingiz mumkin bo‘ladi.\n\nEkranni qadab qo‘yish uchun:\n\n1. Ushbu sozlamani yoqing.\n\n2. Ilovani oching.\n\n3. “So‘nggi ishlatilganlar” tugmasini bosing.\n\n4. Qadab qo‘yish belgisini bosing."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Ishchi profil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Tajribaviy)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Qurilma aylanganda"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ekrandagi kontent aylansin"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Tik holatda qolsin"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Yotiq holatda qolsin"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Joriy holatda qolsin"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a142c4d..1c83c8e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Yêu cầu ghép nối"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Chạm để ghép nối với  <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Hiển thị các tệp đã nhận"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Trình chọn thiết bị Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Yêu cầu quyền Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Một ứng dụng muốn bật Bluetooth."</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Một ứng dụng muốn đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Không có tác vụ đặt lại nào được thực hiện vì dịch vụ Xóa hệ thống không khả dụng."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Đặt lại?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Khôi phục cài đặt gốc không khả dụng cho người dùng này"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Đang xóa"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Vui lòng chờ..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Xóa bộ nhớ USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Xóa thẻ SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Xóa t.cả dữ liệu trong b.nhớ USB"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"Bản quyền"</string>
     <string name="license_title" msgid="1990487604356037871">"Giấy phép"</string>
     <string name="terms_title" msgid="7697580845616764642">"Điều khoản và điều kiện"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Giấy phép nguồn mở"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Đã xảy ra sự cố khi tải giấy phép."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Đang tải…"</string>
@@ -1837,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Bạn cần đặt mã PIN hoặc mật khẩu khóa màn hình trước khi có thể sử dụng vùng lưu trữ thông tin xác thực."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Ứng dụng có quyền truy cập sử dụng"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Cho phép truy cập?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Nếu bạn cho phép truy cập, ứng dụng này có thể xem thông tin chung về ứng dụng trên thiết bị của bạn, chẳng hạn như tần suất sử dụng."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Âm khẩn cấp"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Đặt chế độ khi cuộc gọi khẩn cấp được thực hiện"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sao lưu &amp; đặt lại"</string>
@@ -2025,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Giới hạn quá trình nền"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Hiển thị tất cả ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"H.thị h.thoại Ư. dụng ko đáp ứng cho ư.dụng nền"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Vui lòng dùng ứng dụng GoogleSettings cho hoạt động này"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Giảm sử dụng mạng WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Giảm sử dụng mạng bằng cách ủy quyền kết nối WebView thông qua các máy chủ nén của Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Sử dụng dữ liệu"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Mức sử dụng dữ liệu ứng dụng"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Tính toán dữ liệu của nhà cung cấp dịch vụ có thể khác với thiết bị của bạn."</string>
@@ -2473,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Khi cài đặt này được bật, bạn có thể đưa thiết bị vào trạng thái duy trì hiển thị màn hình hiện tại.\n\nĐể ghim màn hình:\n\n1. Bật cài đặt này.\n\n2. Mở ứng dụng.\n\n3. Chạm vào nút Gần đây.\n\n4. Chạm vào biểu tượng ghim."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Hồ sơ công việc"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Thử nghiệm)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Khi xoay thiết bị"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Xoay các nội dung của màn hình"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Giữ nguyên chế độ xem dọc"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Giữ nguyên chế độ xem ngang"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Giữ nguyên hướng hiện tại"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index bb2a319..393714c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配对请求"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"触摸可与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对。"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"显示接收到的文件"</string>
-    <string name="device_picker" msgid="8398232791303186677">"蓝牙设备选择器"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"蓝牙权限请求"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"某个应用想要打开蓝牙。"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内可检测到您的平板电脑。"</string>
@@ -470,12 +471,9 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"蓝牙"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"管理连接、设置设备名称和可检测性"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"蓝牙配对请求"</string>
-    <!-- no translation found for bluetooth_enter_pin_msg (4954085254142996877) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing_key_msg (333005542843637754) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_passkey_msg (6813273136442138444) -->
-    <skip />
+    <string name="bluetooth_enter_pin_msg" msgid="4954085254142996877">"设备"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="333005542843637754">"配对码"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"输入配对码，然后按回车键"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN 由字母或符号组成"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"通常为 0000 或 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"您可能还需要在另一设备上输入此PIN码。"</string>
@@ -1043,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"“系统清除”服务不可用，因此未执行重置操作。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"要重置吗？"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"此用户无权恢复出厂设置"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"正在清除"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"请稍候…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"格式化USB存储设备"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"格式化SD卡"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"清除USB存储设备中的全部数据"</string>
@@ -1141,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"版权"</string>
     <string name="license_title" msgid="1990487604356037871">"许可"</string>
     <string name="terms_title" msgid="7697580845616764642">"条款"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"开放源代码许可"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"加载许可时出现问题。"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"正在加载..."</string>
@@ -1840,8 +1840,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您需要先设置锁屏PIN码或密码才能使用凭据存储。"</string>
     <string name="usage_access_title" msgid="332333405495457839">"有权查看使用情况的应用"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"要允许查看吗？"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"如果您允许此应用查看使用情况数据，它将可以查看与您设备上的应用相关的常规信息，例如，您使用这些应用的频率。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"紧急提示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"设置进行紧急呼救时的行为"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"备份和重置"</string>
@@ -2028,11 +2027,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"后台进程限制"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"显示所有“应用无响应”(ANR)"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"为后台应用显示“应用无响应”对话框"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"请使用“Google设置”应用执行此操作"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"节省WebView网络流量"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"通过将Google压缩服务器用作WebView连接代理，节省网络流量"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"流量使用情况"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"应用数据流量"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"运营商的流量计算方式可能与您设备的计算方式不同。"</string>
@@ -2476,4 +2473,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"开启此设置后，您可以使设备一直显示某个屏幕。\n\n要使用单应用模式，请执行以下操作：\n\n1. 开启此设置。\n\n2. 打开某个应用。\n\n3. 触摸“最近”按钮。\n\n4. 触摸图钉图标。"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"工作资料"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"（实验性）"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"设备旋转时"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"旋转屏幕内容方向"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"保持纵向"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"保持横向"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持当前方向"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e520793..aebd2a9 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配對連線要求"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"輕觸即可與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」配對。"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"顯示已接收的檔案"</string>
-    <string name="device_picker" msgid="8398232791303186677">"藍牙裝置選擇器"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"藍牙權限要求"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"應用程式要求開啟藍牙功能。"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"應用程式要求將平板電腦設為向其他藍牙裝置顯示，顯示的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"System Clear 服務暫停，因此無法重設。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"重設？"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"這位使用者無法將裝置恢復原廠設定"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"正在清除"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"請稍候…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"清除 USB 儲存裝置資料"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"清除 SD 記憶卡資料"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"清除 USB 儲存裝置中的所有資料"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"版權"</string>
     <string name="license_title" msgid="1990487604356037871">"授權"</string>
     <string name="terms_title" msgid="7697580845616764642">"條款及細則"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"開放原始碼授權"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"載入授權時發生問題。"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"正在載入..."</string>
@@ -1841,8 +1844,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您必須先設定螢幕鎖定 PIN 或密碼，才能使用憑證儲存空間。"</string>
     <string name="usage_access_title" msgid="332333405495457839">"擁有使用詳情存取權的應用程式"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"允許存取？"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"如果您允許存取，這個應用程式將可檢視與您裝置上的應用程式相關的一般資料，例如您使用這些應用程式的頻率。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急警示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"備份和重設"</string>
@@ -2029,11 +2031,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"背景處理程序限制"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"顯示所有 ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"顯示背景應用程式的「應用程式無回應」對話框"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"請使用「Google 設定」應用程式執行這項操作"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"減少 WebView 網絡使用量"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"透過 Google 壓縮伺服器代理 WebView 連線，以減少網絡用量"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"數據用量"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"應用程式數據用量"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"流動網絡供應商的數據計算方式可能與裝置有所不同。"</string>
@@ -2477,4 +2477,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"開啟這項設定時，可讓裝置鎖定在目前的螢幕。\n\n如何固定螢幕：\n\n1. 開啟這項設定。\n\n2. 開啟應用程式。\n\n3. 輕觸 [最近] 按鈕。\n\n4. 輕觸圖釘圖示。"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"工作設定檔"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(實驗性)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"當裝置旋轉時"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"旋轉畫面內容"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"保持縱向畫面"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"保持橫向畫面"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持目前方向"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index af0e851..c81df76 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配對要求"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"輕觸即可和「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」進行配對。"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"顯示已接收的檔案"</string>
-    <string name="device_picker" msgid="8398232791303186677">"藍牙裝置選擇器"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"藍牙權限要求"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"應用程式要求開啟藍牙功能。"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"應用程式要求開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，讓其他藍牙裝置能搜尋到您的平板電腦。"</string>
@@ -1040,10 +1041,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"無法使用 System Clear 服務，因此未執行任何重設。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"您要重設嗎？"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"這位使用者無法將裝置恢復原廠設定"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"清除中"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"請稍候…"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"清除 USB 儲存裝置"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"清除 SD 卡"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"清除 USB 儲存裝置中的所有資料"</string>
@@ -1138,6 +1137,10 @@
     <string name="copyright_title" msgid="865906688917260647">"版權"</string>
     <string name="license_title" msgid="1990487604356037871">"授權"</string>
     <string name="terms_title" msgid="7697580845616764642">"條款及細則"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"開放原始碼授權"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"載入授權時發生問題"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"載入中…"</string>
@@ -1841,8 +1844,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您必須先設定螢幕鎖定 PIN 或密碼，才能使用憑證儲存空間。"</string>
     <string name="usage_access_title" msgid="332333405495457839">"可存取使用情形資料的應用程式"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"允許存取？"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"如果您允許存取，表示這個應用程式可讀取與您裝置上的應用程式相關的一般資訊，例如各應用程式的使用頻率。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急警示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"備份與重設"</string>
@@ -2029,11 +2031,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"背景處理程序限制"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"顯示所有無回應程式"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"為背景應用程式顯示「應用程式無回應」對話方塊"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"請使用 Google 設定應用程式執行這項操作"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"降低 WebView 網路流量"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"透過 Google 壓縮伺服器 Proxy 處理 WebView 連線，藉此降低網路流量"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"數據用量"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"應用程式數據用量"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"行動通訊業者與裝置的數據計算方式可能有所不同。"</string>
@@ -2474,7 +2474,12 @@
     <string name="switch_on_text" msgid="1124106706920572386">"開啟"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"關閉"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"螢幕固定"</string>
-    <string name="screen_pinning_description" msgid="3022868253807792488">"開啟這項設定時，可讓裝置保持在顯示目前螢幕的狀態。\n\n如何固定螢幕：\n\n1. 開啟這項設定。\n\n2. 開啟應用程式。\n\n3. 輕觸 [最近使用的應用程式] 按鈕。\n\n4. 輕觸圖釘圖示。"</string>
+    <string name="screen_pinning_description" msgid="3022868253807792488">"開啟這項設定時，可讓裝置鎖定在目前的螢幕。\n\n如何固定螢幕：\n\n1. 將螢幕固定功能開啟。\n\n2. 開啟某個應用程式。\n\n3. 輕觸 [最近使用的應用程式] 按鈕。\n\n4. 輕觸圖釘圖示。"</string>
     <string name="managed_user_title" msgid="8101244883654409696">"工作設定檔"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(實驗性)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"當裝置旋轉時"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"旋轉畫面內容"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"保持直向畫面"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"保持橫向畫面"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持目前方向"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d771b87..c423723 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -152,7 +152,8 @@
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Isicelo sokubhangqa"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Thinta ukuze ubhanqe ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Bonisa amafayili atholiwe"</string>
-    <string name="device_picker" msgid="8398232791303186677">"Isikhethi sedivayisi ye-Bluetooth"</string>
+    <!-- no translation found for device_picker (4978696506172252813) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Isicelo semvume ye-Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Uhlelo lokusebenza oluthile lufuna ukwenza ithebulethi yakho ibonakale kwamanye amadivayisi we-Bluetooth kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
@@ -1041,10 +1042,8 @@
     <string name="master_clear_failed" msgid="7959646179737950703">"Akukho ukusetha kabusha okwenziwe ngoba isevisi Yokwesula Isistimu ayitholakali."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Setha kabusha"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"Ukusetha kabusha kwasekuqaleni akutholakaleli lo msebenzisi"</string>
-    <!-- no translation found for master_clear_progress_title (5194793778701994634) -->
-    <skip />
-    <!-- no translation found for master_clear_progress_text (6559096229480527510) -->
-    <skip />
+    <string name="master_clear_progress_title" msgid="5194793778701994634">"Iyasula"</string>
+    <string name="master_clear_progress_text" msgid="6559096229480527510">"Sicela ulinde..."</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Sula isitoreji se-USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Sula ikhadi le-SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Isusa yonke idatha kwistoreji se-USB"</string>
@@ -1139,6 +1138,10 @@
     <string name="copyright_title" msgid="865906688917260647">"I-copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Ilayisensi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Imigomo nemibandela"</string>
+    <!-- no translation found for wallpaper_attributions (3645880512943433928) -->
+    <skip />
+    <!-- no translation found for wallpaper_attributions_values (2996183537914690469) -->
+    <skip />
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Vula amalayisensi omthombo"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Kunenkinga yokulayisha amalayisensi."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Iyalayisha..."</string>
@@ -1844,8 +1847,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kumele usethe iphinikhodi noma iphasiwedi yokukhiya isikrini ngaphambi kokusebenzisa ukugcina kokuqinisekisa."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Izinhlelo zokusebenza ezinokufinyelela kokusebenza"</string>
     <string name="allow_usage_access_title" msgid="2134237975190472249">"Vumela ukufinyelela?"</string>
-    <!-- no translation found for allow_usage_access_message (2295847177051307496) -->
-    <skip />
+    <string name="allow_usage_access_message" msgid="2295847177051307496">"Uma unika amandla ukufinyelela, lolu hlelo lokusebenza lungabuka ulwazi olujwayelekile mayelana nezinhlelo zokusebenza kudivayisi yakho, olufana nokuthi uwasebenzisa ngokuvamile kangakanani."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ithoni ephuthumayo"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Hlela ukuziphatha lapho ikholi oluphuthumayo lwenziwa"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Yenza isipele &amp; usethe kabusha"</string>
@@ -2032,11 +2034,9 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Isilinganiso senqubo yesithombe sanemuva"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Bonisa wonke ama-ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Boniso idayalogi Yohlelo Lokusebenza Olungasabeli kwizinhlelo zokusebenza zasemuva"</string>
-    <!-- no translation found for dev_settings_use_google_settings (2139038099847738861) -->
-    <skip />
+    <string name="dev_settings_use_google_settings" msgid="2139038099847738861">"Sicela usebenzise uhlelo lokusebenza lwe-GoogleSettings lwalokhu kusebenza"</string>
     <string name="webview_data_reduction_proxy" msgid="9184006980398676807">"Yehlisa ukusetshenziswa kwenethiwekhi ye-WebView"</string>
-    <!-- no translation found for webview_data_reduction_proxy_summary (5209841245329895851) -->
-    <skip />
+    <string name="webview_data_reduction_proxy_summary" msgid="5209841245329895851">"Nciphisa ukusetshenziswa kwenethiwekhi ngokwenza ummeleli ukuxhumeka kwe-WebView ngamaseva wokuminyaniswa kwe-Google"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Ukusebenzisa idatha"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ukusetshenziswa kwedatha yohlelo lokusebenza"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ukubalwa kwedatha yenkampani kungahluka kudivayisi yakho."</string>
@@ -2480,4 +2480,9 @@
     <string name="screen_pinning_description" msgid="3022868253807792488">"Uma lesi silungiselelelo sivuliwe, ungabeka idivayisi esimeni esigcina isikrini samanje ekubukeni.\n\nUkuze uphine isikrini:\n\n1. Vula lesi silungiselelo.\n\n2. Vula uhlelo lokusebenza.\n\n3. Thinta inkinobho Okwakamuva.\n\n4. Thinta isithonjana sephini."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Iphrofayela yomsebenzi"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Ukuhlola)"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Uma idivayisi ijikeleziswa"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Jikelezisa okuqukethwe kwesikrini"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Hlala ekubukweni kokuma ngobude"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Hlala ekubukweni kokwakheka kwezwe"</string>
+    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Hlala kumumo wamanje"</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 03b2e90..c7c0020 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -293,6 +293,7 @@
         <item>@string/wifi_security_psk_generic</item>
         <!-- Do not translate. -->
         <item>@string/wifi_security_eap</item>
+
     </string-array>
 
     <!-- Match this with the constants in AccessPoint. --> <skip />
@@ -488,19 +489,6 @@
         <item>Proxy Auto-Config</item>
     </string-array>
 
-    <!-- Locales in this list are displayed with the corresponding
-         name from special_locale_names instead of using the name
-         from Locale.getDisplayName(). -->
-    <string-array translatable="false" name="special_locale_codes">
-        <item>zh_CN</item>
-        <item>zh_TW</item>
-    </string-array>
-
-    <string-array translatable="false" name="special_locale_names">
-        <item>中文 (简体)</item>
-        <item>中文 (繁體)</item>
-    </string-array>
-
     <!-- Authentication Types used in APN editor -->
     <string-array name="apn_auth_entries">
         <item>None</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 58687c9..1c299f5 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -80,18 +80,6 @@
     <color name="setup_wizard_preference_background_color_dark">@*android:color/background_material_dark</color>
     <color name="setup_wizard_preference_background_color_light">@*android:color/background_material_light</color>
 
-    <!-- Default avatar colors -->
-    <color name="pink_500">#ffe91e63</color>
-    <color name="indigo_500">#ff3f51b5</color>
-    <color name="blue_500">#ff4285f4</color>
-    <color name="teal_500">#ff00bcd4</color>
-    <color name="green_500">#ff0f9d58</color>
-    <color name="light_green_500">#ff8bc34a</color>
-    <color name="orange_500">#ffff9800</color>
-    <color name="deep_orange_500">#ffff5722</color>
-    <!-- Avatar color used for guest -->
-    <color name="grey_500">#ff9e9e9e</color>
-
     <color name="wifi_divider">#ffe0e0e0</color>
 
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f270435..0b5f58a 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -91,9 +91,8 @@
     <dimen name="notification_app_icon_size">64dp</dimen>
     <dimen name="notification_app_icon_badge_size">20dp</dimen>
     <dimen name="notification_app_icon_badge_margin">4dp</dimen>
-    <dimen name="zen_mode_dropdown_width">160dp</dimen>
     <dimen name="zen_downtime_checkbox_padding">7dp</dimen>
-    <dimen name="zen_downtime_margin">10dp</dimen>
+    <dimen name="zen_downtime_margin">17dp</dimen>
 
     <!-- Default text size for caption preview samples. Uses dp rather than sp because captions are not scaled. -->
     <dimen name="caption_preview_text_size">48dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 96f57cb..e054423 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -315,8 +315,8 @@
     <!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
     <string name="bluetooth_show_received_files">Show received files</string>
 
-    <!-- Strings for BluetoothDevicePicker -->
-    <string name="device_picker">Bluetooth device chooser</string>
+    <!-- Strings for BluetoothDevicePicker [CHAR LIMIT=40]-->
+    <string name="device_picker">Choose Bluetooth device</string>
 
     <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
     <string name="bluetooth_permission_request">"Bluetooth permission request"</string>
@@ -2705,6 +2705,10 @@
     <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
     <!-- About phone settings screen, setting option name to see terms and conditions -->
     <string name="terms_title">Terms and conditions</string>
+    <!-- About phone settings screen, setting option name to see wallpapers attributions -->
+    <string name="wallpaper_attributions">Wallpapers</string>
+    <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
+    <string name="wallpaper_attributions_values">Satellite imagery providers:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky</string>
 
     <!-- Title for actual Settings license activity. --> <skip />
     <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
@@ -3804,8 +3808,6 @@
     <string name="power_discharge_remaining"><xliff:g id="remain">%1$s</xliff:g> remaining</string>
     <!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
     <string name="power_charge_remaining"><xliff:g id="until_charged">%1$s</xliff:g> to charge</string>
-    <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging -->
-    <string name="power_discharging"><xliff:g id="level">%1$d</xliff:g>%%</string>
     <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->
     <string name="power_discharging_duration"><xliff:g id="level">%1$d</xliff:g>%%
             - approx. <xliff:g id="time">%2$s</xliff:g> left</string>
@@ -5147,9 +5149,6 @@
     <!-- Button label for cancelling the new-password operation and retaining the user's previous full-backup password -->
     <string name="backup_pw_cancel_button_text">Cancel</string>
 
-    <!-- Representation of a numerical percentage. [CHAR LIMIT=8] -->
-    <string name="percentage"><xliff:g id="number" example="30">%d</xliff:g>%%</string>
-
     <!-- A menu item in "About phone" that allows the user to update the phone with settings
     from their cell phone carrier. The use of the string is similar to the string
     "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
@@ -5480,6 +5479,8 @@
     <string name="user_image_take_photo" msgid="7496128293167402354">Take photo</string>
     <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
     <string name="user_image_choose_photo" msgid="3746334626214970837">Choose photo from Gallery</string>
+    <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
+    <string name="user_image_photo_selector">Select photo</string>
 
     <!-- Text to display in regulatory info screen (from device overlay). -->
     <string name="regulatory_info_text"></string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 03a9fde..20ff544 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -234,6 +234,8 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
+        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
     </style>
 
     <style name="wifi_item_content">
@@ -241,6 +243,8 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">18sp</item>
         <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
+        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
     </style>
 
     <style name="wifi_item_edit_content">
@@ -313,7 +317,18 @@
     </style>
 
     <style name="WifiAssistantButton">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:background">@android:color/white</item>
+        <item name="android:paddingStart">@dimen/wifi_assistant_text_padding</item>
+        <item name="android:paddingEnd">@dimen/wifi_assistant_text_padding</item>
         <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+    </style>
+
+    <style name="WifiAssistantButton.Negative">
+    </style>
+
+    <style name="WifiAssistantButton.Positive">
         <item name="android:textColor">@color/wifi_assistant_color_accent</item>
     </style>
 
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index 1d8ae45..a65b98d 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -39,7 +39,6 @@
             android:key="sensitive"
             android:title="@string/app_notification_sensitive_title"
             android:summary="@string/app_notification_sensitive_summary"
-            android:enabled="false"
             android:persistent="false" />
 
 </PreferenceScreen>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index c9a9a48..2c47c40 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -72,8 +72,14 @@
                 <intent android:action="android.settings.TERMS" />
             </PreferenceScreen>
 
+            <Preference
+                    android:key="wallpaper_attributions"
+                    android:title="@string/wallpaper_attributions"
+                    android:summary="@string/wallpaper_attributions_values"
+                    />
+
         </PreferenceScreen>
-        
+
         <PreferenceScreen
                 android:key="safetylegal"
                 android:title="@string/settings_safetylegal_title">
diff --git a/res/xml/device_picker.xml b/res/xml/device_picker.xml
index 9fef34d..fd043a2 100644
--- a/res/xml/device_picker.xml
+++ b/res/xml/device_picker.xml
@@ -17,13 +17,8 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <Preference
-        android:key="bt_scan"
-        android:title="@string/bluetooth_preference_scan_title" />
-
     <com.android.settings.bluetooth.BluetoothProgressCategory
         android:key="bt_device_list"
-        android:title="@string/bluetooth_preference_found_devices"
         android:orderingFromXml="false" />
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 54acf73..a89d718 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -72,6 +72,8 @@
 
     public static class ConfirmLockPasswordFragment extends Fragment implements OnClickListener,
             OnEditorActionListener, TextWatcher {
+        private static final String KEY_NUM_WRONG_CONFIRM_ATTEMPTS
+                = "confirm_lock_password_fragment.key_num_wrong_confirm_attempts";
         private static final long ERROR_MESSAGE_TIMEOUT = 3000;
         private TextView mPasswordEntry;
         private LockPatternUtils mLockPatternUtils;
@@ -93,6 +95,10 @@
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             mLockPatternUtils = new LockPatternUtils(getActivity());
+            if (savedInstanceState != null) {
+                mNumWrongConfirmAttempts = savedInstanceState.getInt(
+                        KEY_NUM_WRONG_CONFIRM_ATTEMPTS, 0);
+            }
         }
 
         @Override
@@ -166,6 +172,12 @@
             }
         }
 
+        @Override
+        public void onSaveInstanceState(Bundle outState) {
+            super.onSaveInstanceState(outState);
+            outState.putInt(KEY_NUM_WRONG_CONFIRM_ATTEMPTS, mNumWrongConfirmAttempts);
+        }
+
         private void handleNext() {
             final String pin = mPasswordEntry.getText().toString();
             if (mLockPatternUtils.checkPassword(pin)) {
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 7e92cc6..90f9f54 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -38,7 +38,7 @@
 import android.os.storage.IMountService;
 import android.os.storage.StorageManager;
 import android.provider.Settings;
-import android.telecomm.TelecommManager;
+import android.telecom.TelecomManager;
 import android.telephony.TelephonyManager;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -892,7 +892,7 @@
         }
 
         int textId;
-        if (getTelecommManager().isInCall()) {
+        if (getTelecomManager().isInCall()) {
             // Show "return to call"
             textId = R.string.cryptkeeper_return_to_call;
         } else {
@@ -906,9 +906,9 @@
     }
 
     private void takeEmergencyCallAction() {
-        TelecommManager telecommManager = getTelecommManager();
-        if (telecommManager.isInCall()) {
-            telecommManager.showInCallScreen(false /* showDialpad */);
+        TelecomManager telecomManager = getTelecomManager();
+        if (telecomManager.isInCall()) {
+            telecomManager.showInCallScreen(false /* showDialpad */);
         } else {
             launchEmergencyDialer();
         }
@@ -927,8 +927,8 @@
         return (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
     }
 
-    private TelecommManager getTelecommManager() {
-        return (TelecommManager) getSystemService(Context.TELECOMM_SERVICE);
+    private TelecomManager getTelecomManager() {
+        return (TelecomManager) getSystemService(Context.TELECOM_SERVICE);
     }
 
     /**
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 009c758..17c6d88 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -402,7 +402,6 @@
             mAppSwitches = (LinearLayout) mAppDetail.findViewById(R.id.app_switches);
 
             mAppSettings = (Button) mAppDetail.findViewById(R.id.app_settings);
-            mAppSettings.setOnClickListener(mAppSettingsListener);
 
             mAppRestrict = new Switch(inflater.getContext());
             mAppRestrict.setClickable(false);
@@ -860,11 +859,24 @@
                 }
             }
 
+            mAppSettings.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (!isAdded()) {
+                        return;
+                    }
+
+                    // TODO: target towards entire UID instead of just first package
+                    getActivity().startActivityAsUser(mAppSettingsIntent,
+                            new UserHandle(UserHandle.getUserId(uid)));
+                }
+            });
             mAppSettings.setEnabled(matchFound);
             mAppSettings.setVisibility(View.VISIBLE);
 
         } else {
             mAppSettingsIntent = null;
+            mAppSettings.setOnClickListener(null);
             mAppSettings.setVisibility(View.GONE);
         }
 
@@ -1117,16 +1129,6 @@
         }
     };
 
-    private OnClickListener mAppSettingsListener = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            if (!isAdded()) return;
-
-            // TODO: target torwards entire UID instead of just first package
-            startActivity(mAppSettingsIntent);
-        }
-    };
-
     private OnItemClickListener mListListener = new OnItemClickListener() {
         @Override
         public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index 1ea9859..bc22637 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -20,7 +20,6 @@
 import org.xmlpull.v1.XmlPullParserException;
 
 import android.app.Activity;
-import android.app.Dialog;
 import android.app.AlertDialog;
 import android.app.ListFragment;
 import android.app.admin.DeviceAdminInfo;
@@ -127,7 +126,12 @@
 
     @Override
     public void onListItemClick(ListView l, View v, int position, long id) {
-        DeviceAdminInfo dpi = (DeviceAdminInfo) l.getAdapter().getItem(position);
+        Object o = l.getAdapter().getItem(position);
+        if (!(o instanceof DeviceAdminInfo)) {
+            // race conditions may cause this
+            return;
+        }
+        DeviceAdminInfo dpi = (DeviceAdminInfo) o;
         final Activity activity = getActivity();
         final int userId = getUserId(dpi);
         if (userId == UserHandle.myUserId() || !isProfileOwner(dpi)) {
@@ -305,8 +309,8 @@
             final Activity activity = getActivity();
             ViewHolder vh = (ViewHolder) view.getTag();
             Drawable activityIcon = item.loadIcon(activity.getPackageManager());
-            Drawable badgedIcon = mUm.getBadgedDrawableForUser(activityIcon,
-                    new UserHandle(getUserId(item)));
+            Drawable badgedIcon = activity.getPackageManager().getUserBadgedIcon(
+                    activityIcon, new UserHandle(getUserId(item)));
             vh.icon.setImageDrawable(badgedIcon);
             vh.name.setText(item.loadLabel(activity.getPackageManager()));
             vh.checkbox.setChecked(isActiveAdmin(item));
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 0455d74..40c2324 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -62,31 +62,29 @@
             final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)
                     getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
 
-            if (pdbManager != null) {
+            if (pdbManager != null && !pdbManager.getOemUnlockEnabled()) {
                 // if OEM unlock is enabled, this will be wiped during FR process.
-                if (!pdbManager.getOemUnlockEnabled()) {
-                    final ProgressDialog progressDialog = getProgressDialog();
-                    progressDialog.show();
+                final ProgressDialog progressDialog = getProgressDialog();
+                progressDialog.show();
 
-                    // need to prevent orientation changes as we're about to go into
-                    // a long IO request, so we won't be able to access inflate resources on flash
-                    final int oldOrientation = getActivity().getRequestedOrientation();
-                    getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
-                    new AsyncTask<Void, Void, Void>() {
-                        @Override
-                        protected Void doInBackground(Void... params) {
-                            pdbManager.wipe();
-                            return null;
-                        }
+                // need to prevent orientation changes as we're about to go into
+                // a long IO request, so we won't be able to access inflate resources on flash
+                final int oldOrientation = getActivity().getRequestedOrientation();
+                getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
+                new AsyncTask<Void, Void, Void>() {
+                    @Override
+                    protected Void doInBackground(Void... params) {
+                        pdbManager.wipe();
+                        return null;
+                    }
 
-                        @Override
-                        protected void onPostExecute(Void aVoid) {
-                            progressDialog.hide();
-                            getActivity().setRequestedOrientation(oldOrientation);
-                            doMasterClear();
-                        }
-                    }.execute();
-                }
+                    @Override
+                    protected void onPostExecute(Void aVoid) {
+                        progressDialog.hide();
+                        getActivity().setRequestedOrientation(oldOrientation);
+                        doMasterClear();
+                    }
+                }.execute();
             } else {
                 doMasterClear();
             }
diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java
index 142a42c..7d7599f 100644
--- a/src/com/android/settings/RestrictedSettingsFragment.java
+++ b/src/com/android/settings/RestrictedSettingsFragment.java
@@ -141,7 +141,7 @@
     private void ensurePin() {
         if (!mChallengeSucceeded && !mChallengeRequested
                 && mRestrictionsManager.hasRestrictionsProvider()) {
-            Intent intent = mRestrictionsManager.getLocalApprovalIntent();
+            Intent intent = mRestrictionsManager.createLocalApprovalIntent();
             if (intent != null) {
                 mChallengeRequested = true;
                 mChallengeSucceeded = false;
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 7798937..46a3c8e 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -63,6 +63,7 @@
  */
 public class SecuritySettings extends SettingsPreferenceFragment
         implements OnPreferenceChangeListener, DialogInterface.OnClickListener, Indexable {
+    private static final String TRUST_AGENT_CLICK_INTENT = "trust_agent_click_intent";
     static final String TAG = "SecuritySettings";
     private static final Intent TRUST_AGENT_INTENT =
             new Intent(TrustAgentService.SERVICE_INTERFACE);
@@ -127,7 +128,7 @@
 
     private boolean mIsPrimary;
 
-    private Preference mClickedTrustAgentPreference;
+    private Intent mTrustAgentClickIntent;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -138,6 +139,11 @@
         mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);
 
         mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
+
+        if (savedInstanceState != null
+                && savedInstanceState.containsKey(TRUST_AGENT_CLICK_INTENT)) {
+            mTrustAgentClickIntent = savedInstanceState.getParcelable(TRUST_AGENT_CLICK_INTENT);
+        }
     }
 
     private static int getResIdForLockUnlockScreen(Context context,
@@ -505,6 +511,14 @@
     }
 
     @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (mTrustAgentClickIntent != null) {
+            outState.putParcelable(TRUST_AGENT_CLICK_INTENT, mTrustAgentClickIntent);
+        }
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
 
@@ -554,12 +568,12 @@
         } else if (KEY_TRUST_AGENT.equals(key)) {
             ChooseLockSettingsHelper helper =
                     new ChooseLockSettingsHelper(this.getActivity(), this);
-            mClickedTrustAgentPreference = preference;
+            mTrustAgentClickIntent = preference.getIntent();
             if (!helper.launchConfirmationActivity(CHANGE_TRUST_AGENT_SETTINGS, null, null) &&
-                preference.getIntent() != null) {
+                    mTrustAgentClickIntent != null) {
                 // If this returns false, it means no password confirmation is required.
-                startActivity(preference.getIntent());
-                mClickedTrustAgentPreference = null;
+                startActivity(mTrustAgentClickIntent);
+                mTrustAgentClickIntent = null;
             }
         } else {
             // If we didn't handle it, let preferences handle it.
@@ -587,13 +601,11 @@
             // because mBiometricWeakLiveliness could be null
             return;
         } else if (requestCode == CHANGE_TRUST_AGENT_SETTINGS && resultCode == Activity.RESULT_OK) {
-            if (mClickedTrustAgentPreference != null) {
-                Intent intent = mClickedTrustAgentPreference.getIntent();
-                if (intent != null) {
-                    startActivity(intent);
-                }
-                mClickedTrustAgentPreference = null;
+            if (mTrustAgentClickIntent != null) {
+                startActivity(mTrustAgentClickIntent);
+                mTrustAgentClickIntent = null;
             }
+            return;
         }
         createPreferenceHierarchy();
     }
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 83b3a68..e87f676 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -51,7 +51,7 @@
     private static final String TAG = "SettingsPreferenceFragment";
 
     private static final int MENU_HELP = Menu.FIRST + 100;
-    private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 400;
+    private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 600;
 
     private static final String SAVE_HIGHLIGHTED_KEY = "android:preference_highlighted";
 
@@ -230,12 +230,15 @@
                     listView.postDelayed(new Runnable() {
                         @Override
                         public void run() {
-                            final View v = listView.getChildAt(0);
-                            final int centerX = v.getWidth() / 2;
-                            final int centerY = v.getHeight() / 2;
-                            highlight.setHotspot(centerX, centerY);
-                            v.setPressed(true);
-                            v.setPressed(false);
+                            final int index = position - listView.getFirstVisiblePosition();
+                            if (index >= 0 && index < listView.getChildCount()) {
+                                final View v = listView.getChildAt(index);
+                                final int centerX = v.getWidth() / 2;
+                                final int centerY = v.getHeight() / 2;
+                                highlight.setHotspot(centerX, centerY);
+                                v.setPressed(true);
+                                v.setPressed(false);
+                            }
                         }
                     }, DELAY_HIGHLIGHT_DURATION_MILLIS);
                 }
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 98d1a53..4efbe02 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -16,21 +16,24 @@
 
 package com.android.settings;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
+import android.content.pm.UserInfo;
+import android.content.res.TypedArray;
 import android.net.http.SslCertificate;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.security.IKeyChainService;
 import android.security.KeyChain;
 import android.security.KeyChain.KeyChainConnection;
+import android.util.SparseArray;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -38,9 +41,10 @@
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
+import android.widget.BaseExpandableListAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.FrameLayout;
+import android.widget.ExpandableListView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.ProgressBar;
@@ -48,15 +52,13 @@
 import android.widget.TabHost;
 import android.widget.TextView;
 
+import com.android.internal.util.ParcelableString;
+
 import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Set;
-
-import com.android.org.conscrypt.TrustedCertificateStore;
 
 public class TrustedCredentialsSettings extends Fragment {
 
@@ -72,12 +74,14 @@
                R.id.system_tab,
                R.id.system_progress,
                R.id.system_list,
+               R.id.system_expandable_list,
                true),
         USER("user",
              R.string.trusted_credentials_user_tab,
              R.id.user_tab,
              R.id.user_progress,
              R.id.user_list,
+             R.id.user_expandable_list,
              false);
 
         private final String mTag;
@@ -85,28 +89,34 @@
         private final int mView;
         private final int mProgress;
         private final int mList;
+        private final int mExpandableList;
         private final boolean mCheckbox;
-        private Tab(String tag, int label, int view, int progress, int list, boolean checkbox) {
+
+        private Tab(String tag, int label, int view, int progress, int list, int expandableList,
+                boolean checkbox) {
             mTag = tag;
             mLabel = label;
             mView = view;
             mProgress = progress;
             mList = list;
+            mExpandableList = expandableList;
             mCheckbox = checkbox;
         }
-        private Set<String> getAliases(TrustedCertificateStore store) {
+
+        private List<ParcelableString> getAliases(IKeyChainService service) throws RemoteException {
             switch (this) {
-                case SYSTEM:
-                    return store.allSystemAliases();
+                case SYSTEM: {
+                    return service.getSystemCaAliases().getList();
+                }
                 case USER:
-                    return store.userAliases();
+                    return service.getUserCaAliases().getList();
             }
             throw new AssertionError();
         }
-        private boolean deleted(TrustedCertificateStore store, String alias) {
+        private boolean deleted(IKeyChainService service, String alias) throws RemoteException {
             switch (this) {
                 case SYSTEM:
-                    return !store.containsAlias(alias);
+                    return !service.containsCaAlias(alias);
                 case USER:
                     return false;
             }
@@ -141,7 +151,7 @@
                 if (certHolder.mTab.mCheckbox) {
                     certHolder.mDeleted = !certHolder.mDeleted;
                 } else {
-                    certHolder.mAdapter.mCertHolders.remove(certHolder);
+                    certHolder.mAdapter.remove(certHolder);
                 }
                 certHolder.mAdapter.notifyDataSetChanged();
             } else {
@@ -151,10 +161,9 @@
         }
     }
 
-    // be careful not to use this on the UI thread since it is does file operations
-    private final TrustedCertificateStore mStore = new TrustedCertificateStore();
-
     private TabHost mTabHost;
+    private final SparseArray<KeyChainConnection>
+            mKeyChainConnectionByProfileId = new SparseArray<KeyChainConnection>();
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -176,6 +185,19 @@
         }
         return mTabHost;
     }
+    @Override
+    public void onDestroy() {
+        closeKeyChainConnections();
+        super.onDestroy();
+    }
+
+    private void closeKeyChainConnections() {
+        final int n = mKeyChainConnectionByProfileId.size();
+        for (int i = 0; i < n; ++i) {
+            mKeyChainConnectionByProfileId.valueAt(i).close();
+        }
+        mKeyChainConnectionByProfileId.clear();
+    }
 
     private void addTab(Tab tab) {
         TabHost.TabSpec systemSpec = mTabHost.newTabSpec(tab.mTag)
@@ -183,86 +205,262 @@
                 .setContent(tab.mView);
         mTabHost.addTab(systemSpec);
 
-        ListView lv = (ListView) mTabHost.findViewById(tab.mList);
-        final TrustedCertificateAdapter adapter = new TrustedCertificateAdapter(tab);
-        lv.setAdapter(adapter);
-        lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override public void onItemClick(AdapterView<?> parent, View view, int pos, long id) {
-                showCertDialog(adapter.getItem(pos));
-            }
-        });
+        if (mUserManager.getUserProfiles().size() > 1) {
+            ExpandableListView lv = (ExpandableListView) mTabHost.findViewById(tab.mExpandableList);
+            final TrustedCertificateExpandableAdapter adapter =
+                    new TrustedCertificateExpandableAdapter(tab);
+            lv.setAdapter(adapter);
+            lv.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
+                    @Override
+                public boolean onChildClick(ExpandableListView parent, View v,
+                        int groupPosition, int childPosition, long id) {
+                    showCertDialog(adapter.getChild(groupPosition, childPosition));
+                    return true;
+                }
+            });
+        } else {
+            ListView lv = (ListView) mTabHost.findViewById(tab.mList);
+            final TrustedCertificateAdapter adapter = new TrustedCertificateAdapter(tab);
+            lv.setAdapter(adapter);
+            lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                @Override public void onItemClick(AdapterView<?> parent, View view,
+                        int pos, long id) {
+                    showCertDialog(adapter.getItem(pos));
+                }
+            });
+        }
     }
 
-    private class TrustedCertificateAdapter extends BaseAdapter {
-        private final List<CertHolder> mCertHolders = new ArrayList<CertHolder>();
-        private final Tab mTab;
-        private TrustedCertificateAdapter(Tab tab) {
-            mTab = tab;
+    /**
+     * Common interface for adapters of both expandable and non-expandable certificate lists.
+     */
+    private interface TrustedCertificateAdapterCommons {
+        /**
+         * Remove a certificate from the list.
+         * @param certHolder the certificate to be removed.
+         */
+        void remove(CertHolder certHolder);
+        /**
+         * Notify the adapter that the underlying data set has changed.
+         */
+        void notifyDataSetChanged();
+        /**
+         * Load the certificates.
+         */
+        void load();
+        /**
+         * Gets the identifier of the list view the adapter is connected to.
+         * @param tab the tab on which the list view resides.
+         * @return identifier of the list view.
+         */
+        int getListViewId(Tab tab);
+    }
+
+    /**
+     * Adapter for expandable list view of certificates. Groups in the view correspond to profiles
+     * whereas children correspond to certificates.
+     */
+    private class TrustedCertificateExpandableAdapter extends BaseExpandableListAdapter implements
+            TrustedCertificateAdapterCommons {
+        private AdapterData mData;
+
+        private TrustedCertificateExpandableAdapter(Tab tab) {
+            mData = new AdapterData(tab, this);
             load();
         }
-        private void load() {
-            new AliasLoader().execute();
+        @Override
+        public void remove(CertHolder certHolder) {
+            mData.remove(certHolder);
+        }
+        @Override
+        public int getGroupCount() {
+            return mData.mCertHoldersByUserId.size();
+        }
+        @Override
+        public int getChildrenCount(int groupPosition) {
+            List<CertHolder> certHolders = mData.mCertHoldersByUserId.valueAt(groupPosition);
+            if (certHolders != null) {
+                return certHolders.size();
+            }
+            return 0;
+        }
+        @Override
+        public UserHandle getGroup(int groupPosition) {
+            return new UserHandle(mData.mCertHoldersByUserId.keyAt(groupPosition));
+        }
+        @Override
+        public CertHolder getChild(int groupPosition, int childPosition) {
+            return mData.mCertHoldersByUserId.valueAt(groupPosition).get(childPosition);
+        }
+        @Override
+        public long getGroupId(int groupPosition) {
+            return mData.mCertHoldersByUserId.keyAt(groupPosition);
+        }
+        @Override
+        public long getChildId(int groupPosition, int childPosition) {
+            return childPosition;
+        }
+        @Override
+        public boolean hasStableIds() {
+            return false;
+        }
+        @Override
+        public View getGroupView(int groupPosition, boolean isExpanded, View convertView,
+                ViewGroup parent) {
+            if (convertView == null) {
+                LayoutInflater inflater = (LayoutInflater) getActivity()
+                        .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                convertView = inflateCategoryHeader(inflater, parent);
+            }
+
+            final TextView title = (TextView) convertView.findViewById(android.R.id.title);
+            final UserHandle profile = getGroup(groupPosition);
+            final UserInfo userInfo = mUserManager.getUserInfo(profile.getIdentifier());
+            title.setText(userInfo.name);
+            title.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
+
+            return convertView;
+        }
+        @Override
+        public View getChildView(int groupPosition, int childPosition, boolean isLastChild,
+                View convertView, ViewGroup parent) {
+            return getViewForCertificate(getChild(groupPosition, childPosition), mData.mTab,
+                    convertView, parent);
+        }
+        @Override
+        public boolean isChildSelectable(int groupPosition, int childPosition) {
+            return true;
+        }
+        @Override
+        public void load() {
+            mData.new AliasLoader().execute();
+        }
+        @Override
+        public int getListViewId(Tab tab) {
+            return tab.mExpandableList;
+        }
+        private View inflateCategoryHeader(LayoutInflater inflater, ViewGroup parent) {
+            final TypedArray a = inflater.getContext().obtainStyledAttributes(null,
+                    com.android.internal.R.styleable.Preference,
+                    com.android.internal.R.attr.preferenceCategoryStyle, 0);
+            final int resId = a.getResourceId(com.android.internal.R.styleable.Preference_layout,
+                    0);
+            return inflater.inflate(resId, parent, false);
+        }
+
+    }
+
+    private class TrustedCertificateAdapter extends BaseAdapter implements
+            TrustedCertificateAdapterCommons {
+        private final AdapterData mData;
+        private TrustedCertificateAdapter(Tab tab) {
+            mData = new AdapterData(tab, this);
+            load();
+        }
+        @Override
+        public void remove(CertHolder certHolder) {
+            mData.remove(certHolder);
+        }
+        @Override
+        public int getListViewId(Tab tab) {
+            return tab.mList;
+        }
+        @Override
+        public void load() {
+            mData.new AliasLoader().execute();
         }
         @Override public int getCount() {
-            return mCertHolders.size();
+            List<CertHolder> certHolders = mData.mCertHoldersByUserId.valueAt(0);
+            if (certHolders != null) {
+                return certHolders.size();
+            }
+            return 0;
         }
         @Override public CertHolder getItem(int position) {
-            return mCertHolders.get(position);
+            return mData.mCertHoldersByUserId.valueAt(0).get(position);
         }
         @Override public long getItemId(int position) {
             return position;
         }
         @Override public View getView(int position, View view, ViewGroup parent) {
-            ViewHolder holder;
-            if (view == null) {
-                LayoutInflater inflater = LayoutInflater.from(getActivity());
-                view = inflater.inflate(R.layout.trusted_credential, parent, false);
-                holder = new ViewHolder();
-                holder.mSubjectPrimaryView = (TextView)
-                        view.findViewById(R.id.trusted_credential_subject_primary);
-                holder.mSubjectSecondaryView = (TextView)
-                        view.findViewById(R.id.trusted_credential_subject_secondary);
-                holder.mCheckBox = (CheckBox) view.findViewById(R.id.trusted_credential_status);
-                view.setTag(holder);
-            } else {
-                holder = (ViewHolder) view.getTag();
-            }
-            CertHolder certHolder = mCertHolders.get(position);
-            holder.mSubjectPrimaryView.setText(certHolder.mSubjectPrimary);
-            holder.mSubjectSecondaryView.setText(certHolder.mSubjectSecondary);
-            if (mTab.mCheckbox) {
-                holder.mCheckBox.setChecked(!certHolder.mDeleted);
-                holder.mCheckBox.setVisibility(View.VISIBLE);
-            }
-            return view;
-        };
+            return getViewForCertificate(getItem(position), mData.mTab, view, parent);
+        }
+    }
 
-        private class AliasLoader extends AsyncTask<Void, Integer, List<CertHolder>> {
-            ProgressBar mProgressBar;
-            View mList;
+    private class AdapterData {
+        private final SparseArray<List<CertHolder>> mCertHoldersByUserId =
+                new SparseArray<List<CertHolder>>();
+        private final Tab mTab;
+        private final TrustedCertificateAdapterCommons mAdapter;
+
+        private AdapterData(Tab tab, TrustedCertificateAdapterCommons adapter) {
+            mAdapter = adapter;
+            mTab = tab;
+        }
+
+        private class AliasLoader extends AsyncTask<Void, Integer, SparseArray<List<CertHolder>>> {
+            private ProgressBar mProgressBar;
+            private View mList;
+
             @Override protected void onPreExecute() {
                 View content = mTabHost.getTabContentView();
                 mProgressBar = (ProgressBar) content.findViewById(mTab.mProgress);
-                mList = content.findViewById(mTab.mList);
+                mList = content.findViewById(mAdapter.getListViewId(mTab));
                 mProgressBar.setVisibility(View.VISIBLE);
                 mList.setVisibility(View.GONE);
             }
-            @Override protected List<CertHolder> doInBackground(Void... params) {
-                Set<String> aliases = mTab.getAliases(mStore);
-                int max = aliases.size();
-                int progress = 0;
-                List<CertHolder> certHolders = new ArrayList<CertHolder>(max);
-                for (String alias : aliases) {
-                    X509Certificate cert = (X509Certificate) mStore.getCertificate(alias, true);
-                    certHolders.add(new CertHolder(mStore,
-                                                   TrustedCertificateAdapter.this,
-                                                   mTab,
-                                                   alias,
-                                                   cert));
-                    publishProgress(++progress, max);
+            @Override protected SparseArray<List<CertHolder>> doInBackground(Void... params) {
+                SparseArray<List<CertHolder>> certHoldersByProfile =
+                        new SparseArray<List<CertHolder>>();
+                try {
+                    List<UserHandle> profiles = mUserManager.getUserProfiles();
+                    final int n = profiles.size();
+                    // First we get all aliases for all profiles in order to show progress
+                    // correctly. Otherwise this could all be in a single loop.
+                    SparseArray<List<ParcelableString>> aliasesByProfileId = new SparseArray<
+                            List<ParcelableString>>(n);
+                    int max = 0;
+                    int progress = 0;
+                    for (int i = 0; i < n; ++i) {
+                        UserHandle profile = profiles.get(i);
+                        int profileId = profile.getIdentifier();
+                        KeyChainConnection keyChainConnection = KeyChain.bindAsUser(getActivity(),
+                                profile);
+                        // Saving the connection for later use on the certificate dialog.
+                        mKeyChainConnectionByProfileId.put(profileId, keyChainConnection);
+                        IKeyChainService service = keyChainConnection.getService();
+                        List<ParcelableString> aliases = mTab.getAliases(service);
+                        max += aliases.size();
+                        aliasesByProfileId.put(profileId, aliases);
+                    }
+                    for (int i = 0; i < n; ++i) {
+                        UserHandle profile = profiles.get(i);
+                        int profileId = profile.getIdentifier();
+                        List<ParcelableString> aliases = aliasesByProfileId.get(profileId);
+                        IKeyChainService service = mKeyChainConnectionByProfileId.get(profileId)
+                                .getService();
+                        List<CertHolder> certHolders = new ArrayList<CertHolder>(max);
+                        final int aliasMax = aliases.size();
+                        for (int j = 0; j < aliasMax; ++j) {
+                            String alias = aliases.get(j).string;
+                            byte[] encodedCertificate = service.getEncodedCaCertificate(alias,
+                                    true);
+                            X509Certificate cert = KeyChain.toCertificate(encodedCertificate);
+                            certHolders.add(new CertHolder(service, mAdapter,
+                                    mTab, alias, cert, profileId));
+                            publishProgress(++progress, max);
+                        }
+                        Collections.sort(certHolders);
+                        certHoldersByProfile.put(profileId, certHolders);
+                    }
+                    return certHoldersByProfile;
+                } catch (RemoteException e) {
+                    Log.e(TAG, "Remote exception while loading aliases.", e);
+                    return new SparseArray<List<CertHolder>>();
+                } catch (InterruptedException e) {
+                    Log.e(TAG, "InterruptedException while loading aliases.", e);
+                    return new SparseArray<List<CertHolder>>();
                 }
-                Collections.sort(certHolders);
-                return certHolders;
             }
             @Override protected void onProgressUpdate(Integer... progressAndMax) {
                 int progress = progressAndMax[0];
@@ -272,21 +470,31 @@
                 }
                 mProgressBar.setProgress(progress);
             }
-            @Override protected void onPostExecute(List<CertHolder> certHolders) {
-                mCertHolders.clear();
-                mCertHolders.addAll(certHolders);
-                notifyDataSetChanged();
-                View content = mTabHost.getTabContentView();
+            @Override protected void onPostExecute(SparseArray<List<CertHolder>> certHolders) {
+                mCertHoldersByUserId.clear();
+                final int n = certHolders.size();
+                for (int i = 0; i < n; ++i) {
+                    mCertHoldersByUserId.put(certHolders.keyAt(i), certHolders.valueAt(i));
+                }
+                mAdapter.notifyDataSetChanged();
                 mProgressBar.setVisibility(View.GONE);
                 mList.setVisibility(View.VISIBLE);
                 mProgressBar.setProgress(0);
             }
         }
+
+        public void remove(CertHolder certHolder) {
+            final int n = mCertHoldersByUserId.size();
+            for (int i = 0; i < n; ++i) {
+                mCertHoldersByUserId.valueAt(i).remove(certHolder);
+            }
+        }
     }
 
     private static class CertHolder implements Comparable<CertHolder> {
-        private final TrustedCertificateStore mStore;
-        private final TrustedCertificateAdapter mAdapter;
+        public int mProfileId;
+        private final IKeyChainService mService;
+        private final TrustedCertificateAdapterCommons mAdapter;
         private final Tab mTab;
         private final String mAlias;
         private final X509Certificate mX509Cert;
@@ -296,12 +504,14 @@
         private final String mSubjectSecondary;
         private boolean mDeleted;
 
-        private CertHolder(TrustedCertificateStore store,
-                           TrustedCertificateAdapter adapter,
+        private CertHolder(IKeyChainService service,
+                           TrustedCertificateAdapterCommons adapter,
                            Tab tab,
                            String alias,
-                           X509Certificate x509Cert) {
-            mStore = store;
+                           X509Certificate x509Cert,
+                           int profileId) {
+            mProfileId = profileId;
+            mService = service;
             mAdapter = adapter;
             mTab = tab;
             mAlias = alias;
@@ -332,7 +542,13 @@
                     mSubjectSecondary = "";
                 }
             }
-            mDeleted = mTab.deleted(mStore, mAlias);
+            try {
+                mDeleted = mTab.deleted(mService, mAlias);
+            } catch (RemoteException e) {
+                Log.e(TAG, "Remote exception while checking if alias " + mAlias + " is deleted.",
+                        e);
+                mDeleted = false;
+            }
         }
         @Override public int compareTo(CertHolder o) {
             int primary = this.mSubjectPrimary.compareToIgnoreCase(o.mSubjectPrimary);
@@ -353,6 +569,32 @@
         }
     }
 
+    private View getViewForCertificate(CertHolder certHolder, Tab mTab, View convertView,
+            ViewGroup parent) {
+        ViewHolder holder;
+        if (convertView == null) {
+            LayoutInflater inflater = LayoutInflater.from(getActivity());
+            convertView = inflater.inflate(R.layout.trusted_credential, parent, false);
+            holder = new ViewHolder();
+            holder.mSubjectPrimaryView = (TextView)
+                    convertView.findViewById(R.id.trusted_credential_subject_primary);
+            holder.mSubjectSecondaryView = (TextView)
+                    convertView.findViewById(R.id.trusted_credential_subject_secondary);
+            holder.mCheckBox = (CheckBox) convertView.findViewById(
+                    R.id.trusted_credential_status);
+            convertView.setTag(holder);
+        } else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+        holder.mSubjectPrimaryView.setText(certHolder.mSubjectPrimary);
+        holder.mSubjectSecondaryView.setText(certHolder.mSubjectSecondary);
+        if (mTab.mCheckbox) {
+            holder.mCheckBox.setChecked(!certHolder.mDeleted);
+            holder.mCheckBox.setVisibility(View.VISIBLE);
+        }
+        return convertView;
+    }
+
     private static class ViewHolder {
         private TextView mSubjectPrimaryView;
         private TextView mSubjectSecondaryView;
@@ -438,13 +680,25 @@
         certDialog.show();
     }
 
-    private void addCertChain(final CertHolder certHolder, final ArrayList<View> views,
-            final ArrayList<String> titles) {
+    private void addCertChain(final CertHolder certHolder,
+            final ArrayList<View> views, final ArrayList<String> titles) {
 
         List<X509Certificate> certificates = null;
         try {
-            certificates = mStore.getCertificateChain(certHolder.mX509Cert);
-        } catch (CertificateException ex) {
+            KeyChainConnection keyChainConnection = mKeyChainConnectionByProfileId.get(
+                    certHolder.mProfileId);
+            IKeyChainService service = keyChainConnection.getService();
+            List<String> chain = service.getCaCertificateChainAliases(certHolder.mAlias, true);
+            final int n = chain.size();
+            certificates = new ArrayList<X509Certificate>(n);
+            for (int i = 0; i < n; ++i) {
+                byte[] encodedCertificate = service.getEncodedCaCertificate(chain.get(i), true);
+                X509Certificate certificate = KeyChain.toCertificate(encodedCertificate);
+                certificates.add(certificate);
+            }
+        } catch (RemoteException ex) {
+            Log.e(TAG, "RemoteException while retrieving certificate chain for root "
+                    + certHolder.mAlias, ex);
             return;
         }
         for (X509Certificate certificate : certificates) {
@@ -461,37 +715,40 @@
 
     private class AliasOperation extends AsyncTask<Void, Void, Boolean> {
         private final CertHolder mCertHolder;
+
         private AliasOperation(CertHolder certHolder) {
             mCertHolder = certHolder;
         }
-        @Override protected Boolean doInBackground(Void... params) {
+
+        @Override
+        protected Boolean doInBackground(Void... params) {
             try {
-                KeyChainConnection keyChainConnection = KeyChain.bind(getActivity());
+                KeyChainConnection keyChainConnection = mKeyChainConnectionByProfileId.get(
+                        mCertHolder.mProfileId);
                 IKeyChainService service = keyChainConnection.getService();
-                try {
-                    if (mCertHolder.mDeleted) {
-                        byte[] bytes = mCertHolder.mX509Cert.getEncoded();
-                        service.installCaCertificate(bytes);
-                        return true;
-                    } else {
-                        return service.deleteCaCertificate(mCertHolder.mAlias);
-                    }
-                } finally {
-                    keyChainConnection.close();
+                if (mCertHolder.mDeleted) {
+                    byte[] bytes = mCertHolder.mX509Cert.getEncoded();
+                    service.installCaCertificate(bytes);
+                    return true;
+                } else {
+                    return service.deleteCaCertificate(mCertHolder.mAlias);
                 }
             } catch (CertificateEncodingException e) {
+                Log.w(TAG, "Error while toggling alias " + mCertHolder.mAlias,
+                        e);
                 return false;
             } catch (IllegalStateException e) {
                 // used by installCaCertificate to report errors
+                Log.w(TAG, "Error while toggling alias " + mCertHolder.mAlias, e);
                 return false;
             } catch (RemoteException e) {
-                return false;
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
+                Log.w(TAG, "Error while toggling alias " + mCertHolder.mAlias, e);
                 return false;
             }
         }
-        @Override protected void onPostExecute(Boolean ok) {
+
+        @Override
+        protected void onPostExecute(Boolean ok) {
             mCertHolder.mTab.postOperationUpdate(ok, mCertHolder);
         }
     }
diff --git a/src/com/android/settings/UsageAccessSettings.java b/src/com/android/settings/UsageAccessSettings.java
index 8d0650b..89e184e 100644
--- a/src/com/android/settings/UsageAccessSettings.java
+++ b/src/com/android/settings/UsageAccessSettings.java
@@ -24,6 +24,8 @@
 import android.app.AppOpsManager;
 import android.app.Dialog;
 import android.app.DialogFragment;
+import android.app.Fragment;
+import android.app.FragmentTransaction;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.pm.IPackageManager;
@@ -316,9 +318,12 @@
             }
 
             // Turning on the setting has a Warning.
-            getFragmentManager().beginTransaction()
-                    .add(new WarningDialog(pe), "warning")
-                    .commit();
+            FragmentTransaction ft = getChildFragmentManager().beginTransaction();
+            Fragment prev = getChildFragmentManager().findFragmentByTag("warning");
+            if (prev != null) {
+                ft.remove(prev);
+            }
+            WarningDialogFragment.newInstance(pe.packageName).show(ft, "warning");
             return false;
         }
         return true;
@@ -330,6 +335,17 @@
         pe.appOpMode = newMode;
     }
 
+    void allowAccess(String packageName) {
+        final PackageEntry entry = mPackageEntryMap.get(packageName);
+        if (entry == null) {
+            Log.w(TAG, "Unable to give access to package " + packageName + ": it does not exist.");
+            return;
+        }
+
+        setNewMode(entry, AppOpsManager.MODE_ALLOWED);
+        entry.preference.setChecked(true);
+    }
+
     private final PackageMonitor mPackageMonitor = new PackageMonitor() {
         @Override
         public void onPackageAdded(String packageName, int uid) {
@@ -342,12 +358,16 @@
         }
     };
 
-    private class WarningDialog extends DialogFragment
+    public static class WarningDialogFragment extends DialogFragment
             implements DialogInterface.OnClickListener {
-        private final PackageEntry mEntry;
+        private static final String ARG_PACKAGE_NAME = "package";
 
-        public WarningDialog(PackageEntry pe) {
-            mEntry = pe;
+        public static WarningDialogFragment newInstance(String packageName) {
+            WarningDialogFragment dialog = new WarningDialogFragment();
+            Bundle args = new Bundle();
+            args.putString(ARG_PACKAGE_NAME, packageName);
+            dialog.setArguments(args);
+            return dialog;
         }
 
         @Override
@@ -364,8 +384,8 @@
         @Override
         public void onClick(DialogInterface dialog, int which) {
             if (which == DialogInterface.BUTTON_POSITIVE) {
-                setNewMode(mEntry, AppOpsManager.MODE_ALLOWED);
-                mEntry.preference.setChecked(true);
+                ((UsageAccessSettings) getParentFragment()).allowAccess(
+                        getArguments().getString(ARG_PACKAGE_NAME));
             } else {
                 dialog.cancel();
             }
diff --git a/src/com/android/settings/UserSpinnerAdapter.java b/src/com/android/settings/UserSpinnerAdapter.java
index 32ef3be..b44caac 100644
--- a/src/com/android/settings/UserSpinnerAdapter.java
+++ b/src/com/android/settings/UserSpinnerAdapter.java
@@ -31,6 +31,7 @@
 import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 
+import com.android.internal.util.UserIcons;
 import com.android.settings.drawable.CircleFramedDrawable;
 import com.android.settings.R;
 
@@ -57,7 +58,11 @@
             } else {
                 name = userInfo.name;
                 Bitmap bitmap = um.getUserIcon(userHandle.getIdentifier());
-                icon = (bitmap == null) ? null : CircleFramedDrawable.getInstance(context, bitmap);
+                if (bitmap != null) {
+                    icon = CircleFramedDrawable.getInstance(context, bitmap);
+                } else {
+                    icon = UserIcons.getDefaultUserIcon(userInfo.id, /* light= */ false);
+                }
             }
         }
     }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 47ff6af..60bf226 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -61,6 +61,8 @@
 import android.provider.ContactsContract.RawContacts;
 import android.service.persistentdata.PersistentDataBlockManager;
 import android.telephony.TelephonyManager;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -68,6 +70,8 @@
 import android.widget.ListView;
 import android.widget.TabWidget;
 
+import com.android.internal.util.ImageUtils;
+import com.android.internal.util.UserIcons;
 import com.android.settings.UserSpinnerAdapter.UserDetails;
 import com.android.settings.dashboard.DashboardCategory;
 import com.android.settings.dashboard.DashboardTile;
@@ -76,6 +80,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetAddress;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -123,6 +128,10 @@
 
     private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";
 
+    private static final int SECONDS_PER_MINUTE = 60;
+    private static final int SECONDS_PER_HOUR = 60 * 60;
+    private static final int SECONDS_PER_DAY = 24 * 60 * 60;
+
     /**
      * Finds a matching activity for a preference's intent. If a matching
      * activity is not found, it will remove the preference.
@@ -314,12 +323,28 @@
         }
     }
 
+    /** Formats the ratio of amount/total as a percentage. */
+    public static String formatPercentage(long amount, long total) {
+        return formatPercentage(((double) amount) / total);
+    }
+
+    /** Formats an integer from 0..100 as a percentage. */
+    public static String formatPercentage(int percentage) {
+        return formatPercentage(((double) percentage) / 100.0);
+    }
+
+    /** Formats a double from 0.0..1.0 as a percentage. */
+    private static String formatPercentage(double percentage) {
+      BidiFormatter bf = BidiFormatter.getInstance();
+      return bf.unicodeWrap(NumberFormat.getPercentInstance().format(percentage));
+    }
+
     public static boolean isBatteryPresent(Intent batteryChangedIntent) {
         return batteryChangedIntent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, true);
     }
 
     public static String getBatteryPercentage(Intent batteryChangedIntent) {
-        return String.valueOf(getBatteryLevel(batteryChangedIntent)) + "%";
+        return formatPercentage(getBatteryLevel(batteryChangedIntent));
     }
 
     public static int getBatteryLevel(Intent batteryChangedIntent) {
@@ -824,10 +849,13 @@
      * Returns a circular icon for a user.
      */
     public static Drawable getUserIcon(Context context, UserManager um, UserInfo user) {
-        if (user.iconPath == null) return null;
-        Bitmap icon = um.getUserIcon(user.id);
-        if (icon == null) return null;
-        return CircleFramedDrawable.getInstance(context, icon);
+        if (user.iconPath != null) {
+            Bitmap icon = um.getUserIcon(user.id);
+            if (icon != null) {
+                return CircleFramedDrawable.getInstance(context, icon);
+            }
+        }
+        return UserIcons.getDefaultUserIcon(user.id, /* light= */ false);
     }
 
     /**
@@ -839,7 +867,9 @@
         final TelephonyManager tm =
                 (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
 
-        return tm.getSimCount() > 0;
+        // TODO: Uncomment to re-enable SimSettings.
+        // return tm.getSimCount() > 0;
+        return false;
     }
 
     /**
@@ -871,4 +901,58 @@
         return null;
     }
 
+    /**
+     * Returns elapsed time for the given millis, in the following format:
+     * 2d 5h 40m 29s
+     * @param context the application context
+     * @param millis the elapsed time in milli seconds
+     * @param withSeconds include seconds?
+     * @return the formatted elapsed time
+     */
+    public static String formatElapsedTime(Context context, double millis, boolean withSeconds) {
+        StringBuilder sb = new StringBuilder();
+        int seconds = (int) Math.floor(millis / 1000);
+        if (!withSeconds) {
+            // Round up.
+            seconds += 30;
+        }
+
+        int days = 0, hours = 0, minutes = 0;
+        if (seconds >= SECONDS_PER_DAY) {
+            days = seconds / SECONDS_PER_DAY;
+            seconds -= days * SECONDS_PER_DAY;
+        }
+        if (seconds >= SECONDS_PER_HOUR) {
+            hours = seconds / SECONDS_PER_HOUR;
+            seconds -= hours * SECONDS_PER_HOUR;
+        }
+        if (seconds >= SECONDS_PER_MINUTE) {
+            minutes = seconds / SECONDS_PER_MINUTE;
+            seconds -= minutes * SECONDS_PER_MINUTE;
+        }
+        if (withSeconds) {
+            if (days > 0) {
+                sb.append(context.getString(R.string.battery_history_days,
+                        days, hours, minutes, seconds));
+            } else if (hours > 0) {
+                sb.append(context.getString(R.string.battery_history_hours,
+                        hours, minutes, seconds));
+            } else if (minutes > 0) {
+                sb.append(context.getString(R.string.battery_history_minutes, minutes, seconds));
+            } else {
+                sb.append(context.getString(R.string.battery_history_seconds, seconds));
+            }
+        } else {
+            if (days > 0) {
+                sb.append(context.getString(R.string.battery_history_days_no_seconds,
+                        days, hours, minutes));
+            } else if (hours > 0) {
+                sb.append(context.getString(R.string.battery_history_hours_no_seconds,
+                        hours, minutes));
+            } else {
+                sb.append(context.getString(R.string.battery_history_minutes_no_seconds, minutes));
+            }
+        }
+        return sb.toString();
+    }
 }
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
index 28da591..bb60871 100644
--- a/src/com/android/settings/accounts/AccountPreferenceBase.java
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -17,15 +17,10 @@
 
 package com.android.settings.accounts;
 
-import com.google.android.collect.Maps;
-
 import android.accounts.AuthenticatorDescription;
 import android.app.Activity;
-import android.app.ActivityManagerNative;
-import android.app.IActivityManager;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.SyncAdapterType;
 import android.content.SyncStatusObserver;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
@@ -45,7 +40,6 @@
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 
 class AccountPreferenceBase extends SettingsPreferenceFragment
         implements AuthenticatorHelper.OnAccountsUpdateListener {
@@ -59,7 +53,6 @@
 
     private UserManager mUm;
     private Object mStatusChangeListenerHandle;
-    private HashMap<String, ArrayList<String>> mAccountTypeToAuthorities = null;
     protected AuthenticatorHelper mAuthenticatorHelper;
     protected UserHandle mUserHandle;
 
@@ -136,25 +129,7 @@
     };
 
     public ArrayList<String> getAuthoritiesForAccountType(String type) {
-        if (mAccountTypeToAuthorities == null) {
-            mAccountTypeToAuthorities = Maps.newHashMap();
-            SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypesAsUser(
-                    mUserHandle.getIdentifier());
-            for (int i = 0, n = syncAdapters.length; i < n; i++) {
-                final SyncAdapterType sa = syncAdapters[i];
-                ArrayList<String> authorities = mAccountTypeToAuthorities.get(sa.accountType);
-                if (authorities == null) {
-                    authorities = new ArrayList<String>();
-                    mAccountTypeToAuthorities.put(sa.accountType, authorities);
-                }
-                if (Log.isLoggable(TAG, Log.VERBOSE)) {
-                    Log.d(TAG, "added authority " + sa.authority + " to accountType "
-                            + sa.accountType);
-                }
-                authorities.add(sa.authority);
-            }
-        }
-        return mAccountTypeToAuthorities.get(type);
+        return mAuthenticatorHelper.getAuthoritiesForAccountType(type);
     }
 
     /**
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 891fdbb..3c0d9e9 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -31,9 +31,6 @@
 import android.content.IntentFilter;
 import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -60,6 +57,7 @@
 
 import static android.content.Intent.EXTRA_USER;
 import static android.os.UserManager.DISALLOW_MODIFY_ACCOUNTS;
+import static android.provider.Settings.EXTRA_AUTHORITIES;
 
 /**
  * Settings screen for the account types on the device.
@@ -86,6 +84,8 @@
     private ManagedProfileBroadcastReceiver mManagedProfileBroadcastReceiver
                 = new ManagedProfileBroadcastReceiver();
     private Preference mProfileNotAvailablePreference;
+    private String[] mAuthorities;
+    private int mAuthoritiesCount = 0;
 
     /**
      * Holds data related to the accounts belonging to one profile.
@@ -117,6 +117,11 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
+        mProfileNotAvailablePreference = new Preference(getActivity());
+        mAuthorities = getActivity().getIntent().getStringArrayExtra(EXTRA_AUTHORITIES);
+        if (mAuthorities != null) {
+            mAuthoritiesCount = mAuthorities.length;
+        }
         setHasOptionsMenu(true);
     }
 
@@ -192,6 +197,7 @@
             if (preference == profileData.addAccountPreference) {
                 Intent intent = new Intent(ADD_ACCOUNT_ACTION);
                 intent.putExtra(EXTRA_USER, profileData.userInfo.getUserHandle());
+                intent.putExtra(EXTRA_AUTHORITIES, mAuthorities);
                 startActivity(intent);
                 return true;
             }
@@ -335,16 +341,11 @@
             }
         } else {
             // Put a label instead of the accounts list
-            synchronized (this) {
-                if (mProfileNotAvailablePreference == null) {
-                    mProfileNotAvailablePreference = new Preference(getActivity());
-                    mProfileNotAvailablePreference.setEnabled(false);
-                    mProfileNotAvailablePreference.setIcon(R.drawable.empty_icon);
-                    mProfileNotAvailablePreference.setTitle(null);
-                    mProfileNotAvailablePreference.setSummary(
-                            R.string.managed_profile_not_available_label);
-                }
-            }
+            mProfileNotAvailablePreference.setEnabled(false);
+            mProfileNotAvailablePreference.setIcon(R.drawable.empty_icon);
+            mProfileNotAvailablePreference.setTitle(null);
+            mProfileNotAvailablePreference.setSummary(
+                    R.string.managed_profile_not_available_label);
             profileData.preferenceGroup.addPreference(mProfileNotAvailablePreference);
         }
         if (profileData.removeWorkProfilePreference != null) {
@@ -360,6 +361,21 @@
 
         for (int i = 0; i < accountTypes.length; i++) {
             final String accountType = accountTypes[i];
+            if (mAuthoritiesCount > 0) {
+                // Skip showing any account that does not have any of the requested authorities
+                final ArrayList<String> authoritiesForType = helper.getAuthoritiesForAccountType(
+                        accountType);
+                boolean show = false;
+                for (int j = 0; j < mAuthoritiesCount; j++) {
+                    if (authoritiesForType.contains(mAuthorities[j])) {
+                        show = true;
+                        break;
+                    }
+                }
+                if (!show) {
+                    continue;
+                }
+            }
             final CharSequence label = helper.getLabelForType(getActivity(), accountType);
             if (label == null) {
                 continue;
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index 4e97c05..3af28b2 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -22,8 +22,8 @@
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.app.Activity;
-import android.app.ActivityManagerNative;
 import android.app.PendingIntent;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -69,6 +69,7 @@
      * application.
      */
     private static final String KEY_CALLER_IDENTITY = "pendingIntent";
+    private static final String SHOULD_NOT_RESOLVE = "SHOULDN'T RESOLVE!";
 
     private static final String TAG = "AccountSettings";
 
@@ -196,7 +197,21 @@
 
     private void addAccount(String accountType) {
         Bundle addAccountOptions = new Bundle();
-        mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(), 0);
+        /*
+         * The identityIntent is for the purposes of establishing the identity
+         * of the caller and isn't intended for launching activities, services
+         * or broadcasts.
+         *
+         * Unfortunately for legacy reasons we still need to support this. But
+         * we can cripple the intent so that 3rd party authenticators can't
+         * fill in addressing information and launch arbitrary actions.
+         */
+        Intent identityIntent = new Intent();
+        identityIntent.setComponent(new ComponentName(SHOULD_NOT_RESOLVE, SHOULD_NOT_RESOLVE));
+        identityIntent.setAction(SHOULD_NOT_RESOLVE);
+        identityIntent.addCategory(SHOULD_NOT_RESOLVE);
+
+        mPendingIntent = PendingIntent.getBroadcast(this, 0, identityIntent, 0);
         addAccountOptions.putParcelable(KEY_CALLER_IDENTITY, mPendingIntent);
         addAccountOptions.putBoolean(EXTRA_HAS_MULTIPLE_USERS, Utils.hasMultipleUsers(this));
         AccountManager.get(this).addAccountAsUser(
diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java
index 7ea2f12..6cebf5f 100644
--- a/src/com/android/settings/accounts/AuthenticatorHelper.java
+++ b/src/com/android/settings/accounts/AuthenticatorHelper.java
@@ -16,13 +16,17 @@
 
 package com.android.settings.accounts;
 
+import com.google.android.collect.Maps;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SyncAdapterType;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
@@ -52,6 +56,7 @@
     private AuthenticatorDescription[] mAuthDescs;
     private ArrayList<String> mEnabledAccountTypes = new ArrayList<String>();
     private Map<String, Drawable> mAccTypeIconCache = new HashMap<String, Drawable>();
+    private HashMap<String, ArrayList<String>> mAccountTypeToAuthorities = Maps.newHashMap();
 
     private final UserHandle mUserHandle;
     private final UserManager mUm;
@@ -69,7 +74,8 @@
         mUm = userManager;
         mUserHandle = userHandle;
         mListener = listener;
-        // This guarantees that the helper is ready to use once constructed
+        // This guarantees that the helper is ready to use once constructed: the account types and
+        // authorities are initialized
         onAccountsUpdated(null);
     }
 
@@ -104,7 +110,7 @@
                 AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
                 Context authContext = context.createPackageContextAsUser(desc.packageName, 0,
                         mUserHandle);
-                icon = mUm.getBadgedDrawableForUser(
+                icon = mContext.getPackageManager().getUserBadgedIcon(
                         authContext.getResources().getDrawable(desc.iconId), mUserHandle);
                 synchronized (mAccTypeIconCache) {
                     mAccTypeIconCache.put(accountType, icon);
@@ -187,6 +193,7 @@
         if (mListeningToAccountUpdates) {
             mListener.onAccountsUpdate(mUserHandle);
         }
+        buildAccountTypeToAuthoritiesMap();
     }
 
     @Override
@@ -215,4 +222,27 @@
             mListeningToAccountUpdates = false;
         }
     }
+
+    public ArrayList<String> getAuthoritiesForAccountType(String type) {
+        return mAccountTypeToAuthorities.get(type);
+    }
+
+    private void buildAccountTypeToAuthoritiesMap() {
+        mAccountTypeToAuthorities.clear();
+        SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypesAsUser(
+                mUserHandle.getIdentifier());
+        for (int i = 0, n = syncAdapters.length; i < n; i++) {
+            final SyncAdapterType sa = syncAdapters[i];
+            ArrayList<String> authorities = mAccountTypeToAuthorities.get(sa.accountType);
+            if (authorities == null) {
+                authorities = new ArrayList<String>();
+                mAccountTypeToAuthorities.put(sa.accountType, authorities);
+            }
+            if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                Log.d(TAG, "Added authority " + sa.authority + " to accountType "
+                        + sa.accountType);
+            }
+            authorities.add(sa.authority);
+        }
+    }
 }
diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
index 7c0dbdb..e52d640 100644
--- a/src/com/android/settings/accounts/ChooseAccountActivity.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -18,7 +18,6 @@
 
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
-import android.app.ActivityManagerNative;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -216,7 +215,7 @@
             try {
                 AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
                 Context authContext = createPackageContextAsUser(desc.packageName, 0, mUserHandle);
-                icon = mUm.getBadgedDrawableForUser(
+                icon = getPackageManager().getUserBadgedIcon(
                         authContext.getResources().getDrawable(desc.iconId), mUserHandle);
             } catch (PackageManager.NameNotFoundException e) {
                 // TODO: place holder icon for missing account icons?
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 8787bced..074176b 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -18,6 +18,7 @@
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.accounts.AuthenticatorDescription;
 import android.app.ActionBar;
 import android.app.Activity;
 import android.content.ContentResolver;
@@ -25,7 +26,11 @@
 import android.content.SyncAdapterType;
 import android.content.SyncInfo;
 import android.content.SyncStatusInfo;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -423,7 +428,7 @@
      * intent, and hack the location settings to start it as a fragment.
      */
     private void updatePreferenceIntents(PreferenceScreen prefs) {
-        PackageManager pm = getActivity().getPackageManager();
+        final PackageManager pm = getActivity().getPackageManager();
         for (int i = 0; i < prefs.getPreferenceCount();) {
             Preference pref = prefs.getPreference(i);
             Intent intent = pref.getIntent();
@@ -461,8 +466,22 @@
                         pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                             @Override
                             public boolean onPreferenceClick(Preference preference) {
-                                getActivity().startActivityAsUser(preference.getIntent(),
-                                        mUserHandle);
+                                Intent prefIntent = preference.getIntent();
+                                /*
+                                 * Check the intent to see if it resolves to a exported=false
+                                 * activity that doesn't share a uid with the authenticator.
+                                 *
+                                 * Otherwise the intent is considered unsafe in that it will be
+                                 * exploiting the fact that settings has system privileges.
+                                 */
+                                if (isSafeIntent(pm, prefIntent)) {
+                                    getActivity().startActivityAsUser(prefIntent, mUserHandle);
+                                } else {
+                                    Log.e(TAG,
+                                            "Refusing to launch authenticator intent because"
+                                            + "it exploits Settings permissions: "
+                                            + prefIntent);
+                                }
                                 return true;
                             }
                         });
@@ -473,6 +492,32 @@
         }
     }
 
+    /**
+     * Determines if the supplied Intent is safe. A safe intent is one that is
+     * will launch a exported=true activity or owned by the same uid as the
+     * authenticator supplying the intent.
+     */
+    private boolean isSafeIntent(PackageManager pm, Intent intent) {
+        AuthenticatorDescription authDesc =
+                mAuthenticatorHelper.getAccountTypeDescription(mAccountType);
+        ResolveInfo resolveInfo = pm.resolveActivity(intent, 0);
+        if (resolveInfo == null) {
+            return false;
+        }
+        ActivityInfo resolvedActivityInfo = resolveInfo.activityInfo;
+        ApplicationInfo resolvedAppInfo = resolvedActivityInfo.applicationInfo;
+        try {
+            ApplicationInfo authenticatorAppInf = pm.getApplicationInfo(authDesc.packageName, 0);
+            return resolvedActivityInfo.exported
+                    || resolvedAppInfo.uid == authenticatorAppInf.uid;
+        } catch (NameNotFoundException e) {
+            Log.e(TAG,
+                    "Intent considered unsafe due to exception.",
+                    e);
+            return false;
+        }
+    }
+
     @Override
     protected void onAuthDescriptionsUpdated() {
         // Update account icons for all account preference items
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index ac5a78a..e64e56e 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -1041,10 +1041,10 @@
         if (selectedUser.getIdentifier() != UserHandle.myUserId()) {
             Intent intent = new Intent(Settings.ACTION_APPLICATION_SETTINGS);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
             int currentTab = mViewPager.getCurrentItem();
             intent.putExtra(EXTRA_LIST_TYPE, mTabs.get(currentTab).mListType);
             mContext.startActivityAsUser(intent, selectedUser);
-            getActivity().finish();
         }
     }
 
diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java
index 5d0660a..30f6b52 100644
--- a/src/com/android/settings/applications/ProcessStatsDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -39,6 +39,7 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import com.android.settings.R;
+import com.android.settings.Utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -72,11 +73,6 @@
     private ViewGroup mDetailsParent;
     private ViewGroup mServicesParent;
 
-    public static String makePercentString(Resources res, long amount, long total) {
-        final double percent = (((double)amount) / total) * 100;
-        return res.getString(R.string.percentage, (int) Math.round(percent));
-    }
-
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -116,7 +112,7 @@
         final double percentOfWeight = (((double)mEntry.mWeight) / mMaxWeight) * 100;
 
         int appLevel = (int) Math.ceil(percentOfWeight);
-        String appLevelText = makePercentString(getResources(), mEntry.mDuration, mTotalTime);
+        String appLevelText = Utils.formatPercentage(mEntry.mDuration, mTotalTime);
 
         // Set all values in the header.
         final TextView summary = (TextView) mRootView.findViewById(android.R.id.summary);
@@ -203,7 +199,7 @@
                 Formatter.formatShortFileSize(getActivity(),
                         (mUseUss ? mEntry.mMaxUss : mEntry.mMaxPss) * 1024));
         addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_run_time),
-                makePercentString(getResources(), mEntry.mDuration, mTotalTime));
+                Utils.formatPercentage(mEntry.mDuration, mTotalTime));
     }
 
     final static Comparator<ProcStatsEntry.Service> sServiceCompare
@@ -265,10 +261,8 @@
                     if (tail >= 0 && tail < (label.length()-1)) {
                         label = label.substring(tail+1);
                     }
-                    long duration = service.mDuration;
-                    final double percentOfTime = (((double)duration) / mTotalTime) * 100;
-                    addDetailsItem(mServicesParent, label, getActivity().getResources().getString(
-                            R.string.percentage, (int) Math.ceil(percentOfTime)));
+                    String percentage = Utils.formatPercentage(service.mDuration, mTotalTime);
+                    addDetailsItem(mServicesParent, label, percentage);
                 }
             }
         }
diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java
index 197f00a..adf80e5 100644
--- a/src/com/android/settings/applications/ProcessStatsPreference.java
+++ b/src/com/android/settings/applications/ProcessStatsPreference.java
@@ -26,6 +26,7 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import com.android.settings.R;
+import com.android.settings.Utils;
 
 public class ProcessStatsPreference extends Preference {
     private ProcStatsEntry mEntry;
@@ -61,8 +62,7 @@
 
     public void setPercent(double percentOfWeight, double percentOfTime) {
         mProgress = (int) Math.ceil(percentOfWeight);
-        mProgressText = getContext().getResources().getString(
-                R.string.percentage, (int) Math.round(percentOfTime));
+        mProgressText = Utils.formatPercentage((int) percentOfTime);
         notifyChanged();
     }
 
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
index 269ff39..30a8817 100644
--- a/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -43,7 +43,7 @@
 import com.android.internal.util.MemInfoReader;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.fuelgauge.Utils;
+import com.android.settings.Utils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -404,10 +404,11 @@
         mAppListGroup.removeAll();
         mAppListGroup.setOrderingAsAdded(false);
 
+        final long elapsedTime = mStats.mTimePeriodEndRealtime-mStats.mTimePeriodStartRealtime;
+
         mMemStatusPref.setOrder(-2);
         mAppListGroup.addPreference(mMemStatusPref);
-        String durationString = Utils.formatElapsedTime(getActivity(),
-                mStats.mTimePeriodEndRealtime-mStats.mTimePeriodStartRealtime, false);
+        String durationString = Utils.formatElapsedTime(getActivity(), elapsedTime, false);
         CharSequence memString;
         CharSequence[] memStatesStr = getResources().getTextArray(R.array.ram_states);
         if (mMemState >= 0 && mMemState < memStatesStr.length) {
@@ -480,6 +481,15 @@
         int badnessColor = badColors[1 + Math.round(memBadness*(badColors.length-2))];
         colors.setColors(badnessColor, badnessColor, badnessColor);
 
+        // We are now going to scale the mMemTimes to match the total elapsed time.
+        // These are in uptime, so they will often be smaller than the elapsed time,
+        // but if the user taps on the bar we want to show the times to them.  It is confusing
+        // to see them be smaller than what we told them the measured duration is, so just
+        // scaling them up with make things look reasonable with them none the wiser.
+        for (int i=0; i<ProcessStats.ADJ_MEM_FACTOR_COUNT; i++) {
+            mMemTimes[i] = (long)((mMemTimes[i]*(double)elapsedTime)/mTotalTime);
+        }
+
         ProcessStats.TotalMemoryUseCollection totalMem = new ProcessStats.TotalMemoryUseCollection(
                 ProcessStats.ALL_SCREEN_ADJ, memStates);
         mStats.computeTotalMemoryUse(totalMem, now);
@@ -728,15 +738,22 @@
 
         if (DEBUG) Log.d(TAG, "-------------------- BUILDING UI");
 
-        for (int i=0, N=(entries != null ? entries.size() : 0); i<N; i++) {
+        // Find where we should stop.  Because we have two properties we are looking at,
+        // we need to go from the back looking for the first place either holds.
+        int end = entries != null ? entries.size()-1 : -1;
+        while (end >= 0) {
+            ProcStatsEntry proc = entries.get(end);
+            final double percentOfWeight = (((double)proc.mWeight) / mMaxWeight) * 100;
+            final double percentOfTime = (((double)proc.mDuration) / memTotalTime) * 100;
+            if (percentOfWeight >= 1 || percentOfTime >= 25) {
+                break;
+            }
+            end--;
+        }
+        for (int i=0; i<=end; i++) {
             ProcStatsEntry proc = entries.get(i);
             final double percentOfWeight = (((double)proc.mWeight) / mMaxWeight) * 100;
             final double percentOfTime = (((double)proc.mDuration) / memTotalTime) * 100;
-            if (percentOfWeight < 1 && percentOfTime < 33) {
-                if (DEBUG) Log.d(TAG, "Skipping " + proc.mName + " weight=" + percentOfWeight
-                        + " time=" + percentOfTime);
-                continue;
-            }
             ProcessStatsPreference pref = new ProcessStatsPreference(getActivity());
             pref.init(null, proc);
             proc.evaluateTargetPackage(pm, mStats, totals, sEntryCompare, mUseUss,
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index 58b37ec..13d9655 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -75,18 +75,19 @@
     View mHeader;
     ServiceListAdapter mAdapter;
     LinearColorBar mColorBar;
+    TextView mBackgroundProcessPrefix;
+    TextView mAppsProcessPrefix;
+    TextView mForegroundProcessPrefix;
     TextView mBackgroundProcessText;
     TextView mAppsProcessText;
     TextView mForegroundProcessText;
-    
-    int mLastNumBackgroundProcesses = -1;
-    int mLastNumForegroundProcesses = -1;
-    int mLastNumServiceProcesses = -1;
-    long mLastBackgroundProcessMemory = -1;
-    long mLastForegroundProcessMemory = -1;
-    long mLastServiceProcessMemory = -1;
-    long mLastAvailMemory = -1;
-    
+
+    long mCurTotalRam = -1;
+    long mCurHighRam = -1;      // "System" or "Used"
+    long mCurMedRam = -1;       // "Apps" or "Cached"
+    long mCurLowRam = -1;       // "Free"
+    boolean mCurShowCached = false;
+
     Dialog mCurDialog;
 
     MemInfoReader mMemInfoReader = new MemInfoReader();
@@ -98,7 +99,7 @@
         ViewHolder mHolder;
         long mFirstRunTime;
         boolean mSetBackground;
-        
+
         void updateTime(Context context, StringBuilder builder) {
             TextView uptimeView = null;
             
@@ -126,7 +127,7 @@
                     uptimeView = mHolder.uptime;
                 }
             }
-            
+
             if (uptimeView != null) {
                 mSetBackground = false;
                 if (mFirstRunTime >= 0) {
@@ -228,8 +229,7 @@
                 mShowBackground = showBackground;
                 mState.setWatchingBackgroundItems(showBackground);
                 refreshItems();
-                notifyDataSetChanged();
-                mColorBar.setShowingGreen(mShowBackground);
+                refreshUi(true);
             }
         }
 
@@ -329,53 +329,71 @@
             mDataAvail = null;
         }
 
+        mMemInfoReader.readMemInfo();
+
+        /*
         // This is the amount of available memory until we start killing
         // background services.
-        mMemInfoReader.readMemInfo();
         long availMem = mMemInfoReader.getFreeSize() + mMemInfoReader.getCachedSize()
                 - SECONDARY_SERVER_MEM;
         if (availMem < 0) {
             availMem = 0;
         }
+        */
 
         synchronized (mState.mLock) {
-            if (mLastNumBackgroundProcesses != mState.mNumBackgroundProcesses
-                    || mLastBackgroundProcessMemory != mState.mBackgroundProcessMemory
-                    || mLastNumForegroundProcesses != mState.mNumForegroundProcesses
-                    || mLastForegroundProcessMemory != mState.mForegroundProcessMemory
-                    || mLastNumServiceProcesses != mState.mNumServiceProcesses
-                    || mLastServiceProcessMemory != mState.mServiceProcessMemory
-                    || mLastAvailMemory != availMem) {
-                mLastNumBackgroundProcesses = mState.mNumBackgroundProcesses;
-                mLastBackgroundProcessMemory = mState.mBackgroundProcessMemory;
-                mLastForegroundProcessMemory = mState.mForegroundProcessMemory;
-                mLastServiceProcessMemory = mState.mServiceProcessMemory;
-                mLastAvailMemory = availMem;
-                long freeMem = mLastAvailMemory + mLastBackgroundProcessMemory;
+            if (mCurShowCached != mAdapter.mShowBackground) {
+                mCurShowCached = mAdapter.mShowBackground;
+                if (mCurShowCached) {
+                    mForegroundProcessPrefix.setText(getResources().getText(
+                            R.string.running_processes_header_used_prefix));
+                    mAppsProcessPrefix.setText(getResources().getText(
+                            R.string.running_processes_header_cached_prefix));
+                } else {
+                    mForegroundProcessPrefix.setText(getResources().getText(
+                            R.string.running_processes_header_system_prefix));
+                    mAppsProcessPrefix.setText(getResources().getText(
+                            R.string.running_processes_header_apps_prefix));
+                }
+            }
+
+            final long totalRam = mMemInfoReader.getTotalSize();
+            final long medRam;
+            final long lowRam;
+            if (mCurShowCached) {
+                lowRam = mMemInfoReader.getFreeSize() + mMemInfoReader.getCachedSize();
+                medRam = mState.mBackgroundProcessMemory;
+            } else {
+                lowRam = mMemInfoReader.getFreeSize() + mMemInfoReader.getCachedSize()
+                        + mState.mBackgroundProcessMemory;
+                medRam = mState.mServiceProcessMemory;
+
+            }
+            final long highRam = totalRam - medRam - lowRam;
+
+            if (mCurTotalRam != totalRam || mCurHighRam != highRam || mCurMedRam != medRam
+                    || mCurLowRam != lowRam) {
+                mCurTotalRam = totalRam;
+                mCurHighRam = highRam;
+                mCurMedRam = medRam;
+                mCurLowRam = lowRam;
                 BidiFormatter bidiFormatter = BidiFormatter.getInstance();
                 String sizeStr = bidiFormatter.unicodeWrap(
-                        Formatter.formatShortFileSize(getContext(), freeMem));
+                        Formatter.formatShortFileSize(getContext(), lowRam));
                 mBackgroundProcessText.setText(getResources().getString(
                         R.string.running_processes_header_ram, sizeStr));
                 sizeStr = bidiFormatter.unicodeWrap(
-                        Formatter.formatShortFileSize(getContext(),
-                                mLastForegroundProcessMemory + mLastServiceProcessMemory));
+                        Formatter.formatShortFileSize(getContext(), medRam));
                 mAppsProcessText.setText(getResources().getString(
                         R.string.running_processes_header_ram, sizeStr));
                 sizeStr = bidiFormatter.unicodeWrap(
-                        Formatter.formatShortFileSize(getContext(),
-                                mMemInfoReader.getTotalSize() - freeMem
-                                - mLastForegroundProcessMemory - mLastServiceProcessMemory));
+                        Formatter.formatShortFileSize(getContext(), highRam));
                 mForegroundProcessText.setText(getResources().getString(
                         R.string.running_processes_header_ram, sizeStr));
+                mColorBar.setRatios(highRam/(float)totalRam,
+                        medRam/(float)totalRam,
+                        lowRam/(float)totalRam);
             }
-
-            float totalMem = mMemInfoReader.getTotalSize();
-            float totalShownMem = availMem + mLastBackgroundProcessMemory
-                    + mLastServiceProcessMemory;
-            mColorBar.setRatios((totalMem-totalShownMem)/totalMem,
-                    mLastServiceProcessMemory/totalMem,
-                    mLastBackgroundProcessMemory/totalMem);
         }
     }
     
@@ -435,6 +453,9 @@
         mColorBar.setColors(res.getColor(R.color.running_processes_system_ram),
                 res.getColor(R.color.running_processes_apps_ram),
                 res.getColor(R.color.running_processes_free_ram));
+        mBackgroundProcessPrefix = (TextView)mHeader.findViewById(R.id.freeSizePrefix);
+        mAppsProcessPrefix = (TextView)mHeader.findViewById(R.id.appsSizePrefix);
+        mForegroundProcessPrefix = (TextView)mHeader.findViewById(R.id.systemSizePrefix);
         mBackgroundProcessText = (TextView)mHeader.findViewById(R.id.freeSize);
         mAppsProcessText = (TextView)mHeader.findViewById(R.id.appsSize);
         mForegroundProcessText = (TextView)mHeader.findViewById(R.id.systemSize);
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index eca0cca..5d6b17c 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -67,6 +67,8 @@
 
         mCachedDevice = cachedDevice;
 
+        setLayoutResource(R.layout.preference_bt_icon);
+
         if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
             UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
             if (! um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) {
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index ec288f3..826a451 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -44,6 +44,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -83,6 +84,7 @@
     private boolean mAvailableDevicesCategoryIsPresent;
 
     private boolean mInitialScanStarted;
+    private boolean mInitiateDiscoverable;
 
     private TextView mEmptyView;
     private SwitchBar mSwitchBar;
@@ -119,6 +121,7 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         mInitialScanStarted = (savedInstanceState != null);    // don't auto start scan after rotation
+        mInitiateDiscoverable = true;
 
         mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
         getListView().setEmptyView(mEmptyView);
@@ -153,8 +156,7 @@
         }
         super.onResume();
 
-        // Make the device visible to other devices.
-        mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+        mInitiateDiscoverable = true;
 
         if (isUiRestricted()) {
             setDeviceListGroup(getPreferenceScreen());
@@ -244,7 +246,7 @@
             removeAllDevices();
         }
 
-        mLocalManager.getCachedDeviceManager().clearCachedDevices();
+        mLocalManager.getCachedDeviceManager().clearNonBondedDevices();
         mAvailableDevicesCategory.removeAll();
         mInitialScanStarted = true;
         mLocalAdapter.startScanning(true);
@@ -321,10 +323,17 @@
                 mMyDevicePreference.setSummary(getResources().getString(
                             R.string.bluetooth_is_visible_message, mLocalAdapter.getName()));
                 mMyDevicePreference.setSelectable(false);
-                mMyDevicePreference.setEnabled(false);
                 preferenceScreen.addPreference(mMyDevicePreference);
 
                 getActivity().invalidateOptionsMenu();
+
+                // mLocalAdapter.setScanMode is internally synchronized so it is okay for multiple
+                // threads to execute.
+                if (mInitiateDiscoverable) {
+                    // Make the device visible to other devices.
+                    mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+                    mInitiateDiscoverable = false;
+                }
                 return; // not break
 
             case BluetoothAdapter.STATE_TURNING_OFF:
@@ -340,6 +349,7 @@
 
             case BluetoothAdapter.STATE_TURNING_ON:
                 messageId = R.string.bluetooth_turning_on;
+                mInitialScanStarted = false;
                 break;
         }
 
@@ -382,7 +392,7 @@
 
             final CachedBluetoothDevice device = (CachedBluetoothDevice) v.getTag();
             final Activity activity = getActivity();
-            DeviceProfilesSettings profileFrag = (DeviceProfilesSettings)activity.
+            DeviceProfilesSettings profileFragment = (DeviceProfilesSettings)activity.
                 getFragmentManager().findFragmentById(R.id.bluetooth_fragment_settings);
 
             if (mSettingsDialogView != null){
@@ -391,18 +401,27 @@
                     parent.removeView(mSettingsDialogView);
                 }
             }
-            if (profileFrag == null) {
+
+            if (profileFragment == null) {
                 LayoutInflater inflater = getActivity().getLayoutInflater();
                 mSettingsDialogView = inflater.inflate(R.layout.bluetooth_device_settings, null);
-                profileFrag = (DeviceProfilesSettings)activity.getFragmentManager()
+                profileFragment = (DeviceProfilesSettings)activity.getFragmentManager()
                     .findFragmentById(R.id.bluetooth_fragment_settings);
+
+                // To enable scrolling we store the name field in a seperate header and add to
+                // the ListView of the profileFragment.
+                View header = inflater.inflate(R.layout.bluetooth_device_settings_header, null);
+                profileFragment.getListView().addHeaderView(header);
             }
 
             final View dialogLayout = mSettingsDialogView;
             AlertDialog.Builder settingsDialog = new AlertDialog.Builder(activity);
-            profileFrag.setDevice(device);
+            profileFragment.setDevice(device);
             final EditText deviceName = (EditText)dialogLayout.findViewById(R.id.name);
             deviceName.setText(device.getName(), TextView.BufferType.EDITABLE);
+
+            final DeviceProfilesSettings dpsFragment = profileFragment;
+            final Context context = v.getContext();
             settingsDialog.setView(dialogLayout);
             settingsDialog.setTitle(R.string.bluetooth_preference_paired_devices);
             settingsDialog.setPositiveButton(R.string.okay,
@@ -413,7 +432,7 @@
                     device.setName(deviceName.getText().toString());
                 }
             });
-            final Context context = v.getContext();
+
             settingsDialog.setNegativeButton(R.string.forget,
                     new DialogInterface.OnClickListener() {
                 @Override
@@ -426,9 +445,23 @@
                 }
             });
 
+            // We must ensure that the fragment gets destroyed to avoid duplicate fragments.
+            settingsDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                public void onDismiss(final DialogInterface dialog) {
+                    if (!activity.isDestroyed()) {
+                        activity.getFragmentManager().beginTransaction().remove(dpsFragment)
+                            .commitAllowingStateLoss();
+                    }
+                }
+            });
+
             AlertDialog dialog = settingsDialog.create();
             dialog.create();
             dialog.show();
+
+            // We must ensure that clicking on the EditText will bring up the keyboard.
+            dialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+                    | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
         }
     };
 
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
index 0b53b1a..2b0e7f1 100755
--- a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
@@ -112,8 +112,13 @@
         return device.getAddress();
     }
 
-    public synchronized void clearCachedDevices() {
-        mCachedDevices.clear();
+    public synchronized void clearNonBondedDevices() {
+        for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
+            CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
+            if (cachedDevice.getBondState() != BluetoothDevice.BOND_BONDED) {
+                mCachedDevices.remove(i);
+            }
+        }
     }
 
     public synchronized void onScanningStateChanged(boolean started) {
@@ -148,8 +153,8 @@
             for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
                 CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
                 if (cachedDevice.getBondState() != BluetoothDevice.BOND_BONDED) {
-                   cachedDevice.setVisible(false);
-                   mCachedDevices.remove(i);
+                    cachedDevice.setVisible(false);
+                    mCachedDevices.remove(i);
                 } else {
                     // For bonded devices, we need to clear the connection status so that
                     // when BT is enabled next time, device connection status shall be retrieved
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 4b6a6b0..354d03c 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -17,7 +17,6 @@
 package com.android.settings.bluetooth;
 
 import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
-
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothDevicePicker;
@@ -25,6 +24,9 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserManager;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 
 import com.android.settings.R;
 
@@ -33,6 +35,7 @@
  * connection management.
  */
 public final class DevicePickerFragment extends DeviceListPreferenceFragment {
+    private static final int MENU_ID_REFRESH = Menu.FIRST;
 
     public DevicePickerFragment() {
         super(null /* Not tied to any user restrictions. */);
@@ -56,12 +59,36 @@
     }
 
     @Override
+    void initDevicePreference(BluetoothDevicePreference preference) {
+        preference.setWidgetLayoutResource(R.layout.preference_empty_list);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        menu.add(Menu.NONE, MENU_ID_REFRESH, 0, R.string.bluetooth_search_for_devices)
+                .setEnabled(true)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_ID_REFRESH:
+                mLocalAdapter.startScanning(true);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getActivity().setTitle(getString(R.string.device_picker));
         UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
         mStartScanOnResume = !um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)
                 && (savedInstanceState == null);  // don't start scan after rotation
+        setHasOptionsMenu(true);
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index 64c807f..5c2beba 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -78,6 +78,7 @@
         addPreferencesFromResource(R.xml.bluetooth_device_advanced);
         getPreferenceScreen().setOrderingAsAdded(false);
         mProfileContainer = (PreferenceGroup) findPreference(KEY_PROFILE_CONTAINER);
+        mProfileContainer.setLayoutResource(R.layout.bluetooth_preference_category);
 
         mManager = LocalBluetoothManager.getInstance(getActivity());
         CachedBluetoothDeviceManager deviceManager =
@@ -131,8 +132,8 @@
     public void setDevice(CachedBluetoothDevice cachedDevice) {
         mCachedDevice = cachedDevice;
 
-        mCachedDevice.registerCallback(this);
         if (isResumed()) {
+            mCachedDevice.registerCallback(this);
             addPreferencesForProfiles();
             refresh();
         }
@@ -231,7 +232,7 @@
                 status == BluetoothProfile.STATE_CONNECTED;
 
         if (isConnected) {
-            askDisconnect(getActivity(), profile);
+            askDisconnect(mManager.getForegroundActivity(), profile);
         } else {
             if (profile.isPreferred(device)) {
                 // profile is preferred but not connected: disable auto-connect
diff --git a/src/com/android/settings/bluetooth/HidProfile.java b/src/com/android/settings/bluetooth/HidProfile.java
index 8df2845..91e715d 100755
--- a/src/com/android/settings/bluetooth/HidProfile.java
+++ b/src/com/android/settings/bluetooth/HidProfile.java
@@ -169,7 +169,7 @@
 
     public int getDrawableResource(BluetoothClass btClass) {
         if (btClass == null) {
-            return R.drawable.ic_bt_keyboard_hid;
+            return R.drawable.ic_lockscreen_ime;
         }
         return getHidClassDrawable(btClass);
     }
@@ -178,7 +178,7 @@
         switch (btClass.getDeviceClass()) {
             case BluetoothClass.Device.PERIPHERAL_KEYBOARD:
             case BluetoothClass.Device.PERIPHERAL_KEYBOARD_POINTING:
-                return R.drawable.ic_bt_keyboard_hid;
+                return R.drawable.ic_lockscreen_ime;
             case BluetoothClass.Device.PERIPHERAL_POINTING:
                 return R.drawable.ic_bt_pointing_hid;
             default:
diff --git a/src/com/android/settings/drawable/CircleFramedDrawable.java b/src/com/android/settings/drawable/CircleFramedDrawable.java
index f68dace..97c96a0 100644
--- a/src/com/android/settings/drawable/CircleFramedDrawable.java
+++ b/src/com/android/settings/drawable/CircleFramedDrawable.java
@@ -107,7 +107,7 @@
         canvas.drawPath(fillPath, mPaint);
 
         // mask in the icon where the bitmap is opaque
-        mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_ATOP));
+        mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
         canvas.drawBitmap(icon, cropRect, circleRect, mPaint);
 
         // prepare paint for frame drawing
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 9d3edd5..c16708d 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -26,6 +26,7 @@
 import android.util.Log;
 import android.util.TimeUtils;
 import com.android.settings.R;
+import com.android.settings.Utils;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -489,10 +490,8 @@
         mCpuRunningLabel = getContext().getString(R.string.battery_stats_wake_lock_label);
         mPhoneSignalLabel = getContext().getString(R.string.battery_stats_phone_signal_label);
 
-        mMaxPercentLabelString = getContext().getResources().getString(
-                R.string.percentage, 100);
-        mMinPercentLabelString = getContext().getResources().getString(
-                R.string.percentage, 0);
+        mMaxPercentLabelString = Utils.formatPercentage(100);
+        mMinPercentLabelString = Utils.formatPercentage(0);
 
         mBatteryLevel = com.android.settings.Utils.getBatteryLevel(mBatteryBroadcast);
         long remainingTimeUs = 0;
@@ -506,8 +505,7 @@
                 mChargeLabelString = getContext().getResources().getString(
                         R.string.power_discharging_duration, mBatteryLevel, timeString);
             } else {
-                mChargeLabelString = getContext().getResources().getString(
-                        R.string.power_discharging, mBatteryLevel);
+                mChargeLabelString = Utils.formatPercentage(mBatteryLevel);
             }
         } else {
             final long chargeTime = mStats.computeChargeTimeRemaining(elapsedRealtimeUs);
@@ -1013,7 +1011,7 @@
             mTimeRemainPath.close();
         }
 
-        if (mStartWallTime > 0) {
+        if (mStartWallTime > 0 && mEndWallTime > mStartWallTime) {
             // Create the time labels at the bottom.
             boolean is24hr = is24Hour();
             Calendar calStart = Calendar.getInstance();
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index e303dc8..bd989d0 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -16,14 +16,20 @@
 
 package com.android.settings.fuelgauge;
 
+import static android.os.PowerManager.ACTION_POWER_SAVE_MODE_CHANGING;
+
+import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.PowerManager;
 import android.provider.Settings.Global;
 import android.util.Log;
 import android.widget.Switch;
@@ -43,6 +49,7 @@
 
     private final Handler mHandler = new Handler();
     private final SettingsObserver mSettingsObserver = new SettingsObserver(mHandler);
+    private final Receiver mReceiver = new Receiver();
 
     private Context mContext;
     private boolean mCreated;
@@ -50,6 +57,7 @@
     private SwitchBar mSwitchBar;
     private Switch mSwitch;
     private boolean mValidListener;
+    private PowerManager mPowerManager;
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
@@ -76,6 +84,8 @@
             }
         };
         mTriggerPref.init(this);
+
+        mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
     }
 
     @Override
@@ -88,6 +98,7 @@
     public void onResume() {
         super.onResume();
         mSettingsObserver.setListening(true);
+        mReceiver.setListening(true);
         if (!mValidListener) {
             mSwitchBar.addOnSwitchChangeListener(this);
             mValidListener = true;
@@ -99,6 +110,7 @@
     public void onPause() {
         super.onPause();
         mSettingsObserver.setListening(false);
+        mReceiver.setListening(false);
         if (mValidListener) {
             mSwitchBar.removeOnSwitchChangeListener(this);
             mValidListener = false;
@@ -107,43 +119,78 @@
 
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        mHandler.removeCallbacks(mStartMode);
         if (isChecked) {
             mHandler.postDelayed(mStartMode, WAIT_FOR_SWITCH_ANIM);
         } else {
-            if (DEBUG) Log.d(TAG, "Stopping LOW_POWER_MODE from settings");
-            Global.putInt(getContentResolver(), Global.LOW_POWER_MODE, 0);
+            if (DEBUG) Log.d(TAG, "Stopping low power mode from settings");
+            trySetPowerSaveMode(false);
+        }
+    }
+
+    private void trySetPowerSaveMode(boolean mode) {
+        if (!mPowerManager.setPowerSaveMode(mode)) {
+            if (DEBUG) Log.d(TAG, "Setting mode failed, fallback to current value");
+            mHandler.post(mUpdateSwitch);
         }
     }
 
     private void updateSwitch() {
-        final boolean checked = Global.getInt(getContentResolver(), Global.LOW_POWER_MODE, 0) != 0;
-        if (checked == mSwitch.isChecked()) return;
+        final boolean mode = mPowerManager.isPowerSaveMode();
+        if (DEBUG) Log.d(TAG, "updateSwitch: isChecked=" + mSwitch.isChecked() + " mode=" + mode);
+        if (mode == mSwitch.isChecked()) return;
 
         // set listener to null so that that code below doesn't trigger onCheckedChanged()
         if (mValidListener) {
             mSwitchBar.removeOnSwitchChangeListener(this);
         }
-        mSwitch.setChecked(checked);
+        mSwitch.setChecked(mode);
         if (mValidListener) {
             mSwitchBar.addOnSwitchChangeListener(this);
         }
     }
 
+    private final Runnable mUpdateSwitch = new Runnable() {
+        @Override
+        public void run() {
+            updateSwitch();
+        }
+    };
+
     private final Runnable mStartMode = new Runnable() {
         @Override
         public void run() {
             AsyncTask.execute(new Runnable() {
                 @Override
                 public void run() {
-                    if (DEBUG) Log.d(TAG, "Starting LOW_POWER_MODE from settings");
-                    Global.putInt(getContentResolver(), Global.LOW_POWER_MODE, 1);
+                    if (DEBUG) Log.d(TAG, "Starting low power mode from settings");
+                    trySetPowerSaveMode(true);
                 }
             });
         }
     };
 
+    private final class Receiver extends BroadcastReceiver {
+        private boolean mRegistered;
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (DEBUG) Log.d(TAG, "Received " + intent.getAction());
+            mHandler.post(mUpdateSwitch);
+        }
+
+        public void setListening(boolean listening) {
+            if (listening && !mRegistered) {
+                mContext.registerReceiver(this, new IntentFilter(ACTION_POWER_SAVE_MODE_CHANGING));
+                mRegistered = true;
+            } else if (!listening && mRegistered) {
+                mContext.unregisterReceiver(this);
+                mRegistered = false;
+            }
+        }
+    }
+
     private final class SettingsObserver extends ContentObserver {
-        private final Uri LOW_POWER_MODE_URI = Global.getUriFor(Global.LOW_POWER_MODE);
         private final Uri LOW_POWER_MODE_TRIGGER_LEVEL_URI
                 = Global.getUriFor(Global.LOW_POWER_MODE_TRIGGER_LEVEL);
 
@@ -153,9 +200,6 @@
 
         @Override
         public void onChange(boolean selfChange, Uri uri) {
-            if (LOW_POWER_MODE_URI.equals(uri)) {
-                updateSwitch();
-            }
             if (LOW_POWER_MODE_TRIGGER_LEVEL_URI.equals(uri)) {
                 mTriggerPref.update(mContext);
             }
@@ -164,7 +208,6 @@
         public void setListening(boolean listening) {
             final ContentResolver cr = getContentResolver();
             if (listening) {
-                cr.registerContentObserver(LOW_POWER_MODE_URI, false, this);
                 cr.registerContentObserver(LOW_POWER_MODE_TRIGGER_LEVEL_URI, false, this);
             } else {
                 cr.unregisterContentObserver(this);
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index a558533..97012e4 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -25,6 +25,7 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 
 /**
  * Custom preference for displaying power consumption as a bar and an icon on
@@ -47,8 +48,7 @@
 
     public void setPercent(double percentOfMax, double percentOfTotal) {
         mProgress = (int) Math.ceil(percentOfMax);
-        mProgressText = getContext().getResources().getString(
-                R.string.percentage, (int) (percentOfTotal+.5));
+        mProgressText = Utils.formatPercentage((int) (percentOfTotal + 0.5));
         notifyChanged();
     }
 
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index fe4fd81..b745c9d 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -53,6 +53,7 @@
 import com.android.settings.DisplaySettings;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
 import com.android.settings.WirelessSettings;
 import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.bluetooth.BluetoothSettings;
@@ -387,7 +388,7 @@
         mTitleView.setText(mTitle);
 
         final TextView text1 = (TextView)mRootView.findViewById(android.R.id.text1);
-        text1.setText(getString(R.string.percentage, percentage));
+        text1.setText(Utils.formatPercentage(percentage));
 
         mTwoButtonsPanel = (ViewGroup)mRootView.findViewById(R.id.two_buttons_panel);
         mForceStopButton = (Button)mRootView.findViewById(R.id.left_button);
@@ -507,7 +508,7 @@
                         break;
                     case R.string.usage_type_no_coverage:
                         final int percentage = (int) Math.floor(mValues[i]);
-                        value = getActivity().getString(R.string.percentage, percentage);
+                        value = Utils.formatPercentage(percentage);
                         break;
                     case R.string.usage_type_total_battery_capacity:
                     case R.string.usage_type_computed_power:
diff --git a/src/com/android/settings/fuelgauge/Utils.java b/src/com/android/settings/fuelgauge/Utils.java
deleted file mode 100644
index 9a06c9f..0000000
--- a/src/com/android/settings/fuelgauge/Utils.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import android.content.Context;
-
-import com.android.settings.R;
-
-/**
- * Contains utility functions for formatting elapsed time and consumed bytes
- */
-public class Utils {
-    private static final int SECONDS_PER_MINUTE = 60;
-    private static final int SECONDS_PER_HOUR = 60 * 60;
-    private static final int SECONDS_PER_DAY = 24 * 60 * 60;
-
-    /**
-     * Returns elapsed time for the given millis, in the following format:
-     * 2d 5h 40m 29s
-     * @param context the application context
-     * @param millis the elapsed time in milli seconds
-     * @return the formatted elapsed time
-     */
-    public static String formatElapsedTime(Context context, double millis, boolean inclSeconds) {
-        StringBuilder sb = new StringBuilder();
-        int seconds = (int) Math.floor(millis / 1000);
-        if (!inclSeconds) {
-            // Round up.
-            seconds += 30;
-        }
-
-        int days = 0, hours = 0, minutes = 0;
-        if (seconds >= SECONDS_PER_DAY) {
-            days = seconds / SECONDS_PER_DAY;
-            seconds -= days * SECONDS_PER_DAY;
-        }
-        if (seconds >= SECONDS_PER_HOUR) {
-            hours = seconds / SECONDS_PER_HOUR;
-            seconds -= hours * SECONDS_PER_HOUR;
-        }
-        if (seconds >= SECONDS_PER_MINUTE) {
-            minutes = seconds / SECONDS_PER_MINUTE;
-            seconds -= minutes * SECONDS_PER_MINUTE;
-        }
-        if (inclSeconds) {
-            if (days > 0) {
-                sb.append(context.getString(R.string.battery_history_days,
-                        days, hours, minutes, seconds));
-            } else if (hours > 0) {
-                sb.append(context.getString(R.string.battery_history_hours,
-                        hours, minutes, seconds));
-            } else if (minutes > 0) {
-                sb.append(context.getString(R.string.battery_history_minutes, minutes, seconds));
-            } else {
-                sb.append(context.getString(R.string.battery_history_seconds, seconds));
-            }
-        } else {
-            if (days > 0) {
-                sb.append(context.getString(R.string.battery_history_days_no_seconds,
-                        days, hours, minutes));
-            } else if (hours > 0) {
-                sb.append(context.getString(R.string.battery_history_hours_no_seconds,
-                        hours, minutes));
-            } else {
-                sb.append(context.getString(R.string.battery_history_minutes_no_seconds, minutes));
-            }
-        }
-        return sb.toString();
-    }
-}
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index e1bcac5..f0f7307 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -55,6 +55,7 @@
 import android.view.textservice.SpellCheckerInfo;
 import android.view.textservice.TextServicesManager;
 
+import com.android.internal.app.LocalePicker;
 import com.android.settings.R;
 import com.android.settings.Settings.KeyboardLayoutPickerActivity;
 import com.android.settings.SettingsActivity;
@@ -74,6 +75,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.TreeSet;
 
 public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
@@ -252,7 +254,7 @@
 
         if (!mShowsOnlyFullImeAndKeyboardList) {
             if (mLanguagePref != null) {
-                String localeName = getLocaleName(getResources());
+                String localeName = getLocaleName(getActivity());
                 mLanguagePref.setSummary(localeName);
             }
 
@@ -326,42 +328,19 @@
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
-    private static String getLocaleName(Resources resources) {
-        Configuration conf = resources.getConfiguration();
-        String language = conf.locale.getLanguage();
-        String localeName;
-        // TODO: This is not an accurate way to display the locale, as it is
-        // just working around the fact that we support limited dialects
-        // and want to pretend that the language is valid for all locales.
-        // We need a way to support languages that aren't tied to a particular
-        // locale instead of hiding the locale qualifier.
-        if (hasOnlyOneLanguageInstance(language,
-                Resources.getSystem().getAssets().getLocales())) {
-            localeName = conf.locale.getDisplayLanguage(conf.locale);
-        } else {
-            localeName = conf.locale.getDisplayName(conf.locale);
-        }
-
-        if (localeName.length() > 1) {
-            localeName = Character.toUpperCase(localeName.charAt(0))
-                    + localeName.substring(1);
-        }
-
-        return localeName;
-    }
-
-    private static boolean hasOnlyOneLanguageInstance(String languageCode, String[] locales) {
-        int count = 0;
-        for (String localeCode : locales) {
-            if (localeCode.length() > 2
-                    && localeCode.startsWith(languageCode)) {
-                count++;
-                if (count > 1) {
-                    return false;
-                }
+    private static String getLocaleName(Context context) {
+        // We want to show the same string that the LocalePicker used.
+        // TODO: should this method be in LocalePicker instead?
+        Locale currentLocale = context.getResources().getConfiguration().locale;
+        List<LocalePicker.LocaleInfo> locales = LocalePicker.getAllAssetLocales(context, true);
+        for (LocalePicker.LocaleInfo locale : locales) {
+            if (locale.getLocale().equals(currentLocale)) {
+                return locale.getLabel();
             }
         }
-        return count == 1;
+        // This can't happen as long as the locale was one set by Settings.
+        // Fall back in case a developer is testing an unsupported locale.
+        return currentLocale.getDisplayName(currentLocale);
     }
 
     private void saveInputMethodSelectorVisibility(String value) {
@@ -664,12 +643,11 @@
         public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
             List<SearchIndexableRaw> indexables = new ArrayList<>();
 
-            final Resources resources = context.getResources();
             final String screenTitle = context.getString(R.string.language_keyboard_settings_title);
 
             // Locale picker.
             if (context.getAssets().getLocales().length > 1) {
-                String localeName = getLocaleName(resources);
+                String localeName = getLocaleName(context);
                 SearchIndexableRaw indexable = new SearchIndexableRaw(context);
                 indexable.key = KEY_PHONE_LANGUAGE;
                 indexable.title = context.getString(R.string.phone_language);
diff --git a/src/com/android/settings/location/RecentLocationApps.java b/src/com/android/settings/location/RecentLocationApps.java
index e28f96b..7e99725 100644
--- a/src/com/android/settings/location/RecentLocationApps.java
+++ b/src/com/android/settings/location/RecentLocationApps.java
@@ -212,9 +212,9 @@
 
             final UserHandle userHandle = new UserHandle(userId);
             Drawable appIcon = mPackageManager.getApplicationIcon(appInfo);
-            Drawable icon = um.getBadgedDrawableForUser(appIcon, userHandle);
+            Drawable icon = mPackageManager.getUserBadgedIcon(appIcon, userHandle);
             CharSequence appLabel = mPackageManager.getApplicationLabel(appInfo);
-            CharSequence badgedAppLabel = um.getBadgedLabelForUser(appLabel.toString(), userHandle);
+            CharSequence badgedAppLabel = mPackageManager.getUserBadgedLabel(appLabel, userHandle);
             preference = createRecentLocationEntry(icon,
                     appLabel, highBattery, badgedAppLabel,
                     new PackageEntryClickedListener(packageName));
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index add0fa7..20201f4 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -18,12 +18,15 @@
 
 import android.app.ActionBar;
 import android.app.Fragment;
+import android.content.Context;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Switch;
+
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.widget.SwitchBar;
@@ -34,6 +37,7 @@
     private NfcAdapter mNfcAdapter;
     private SwitchBar mSwitchBar;
     private CharSequence mOldActivityTitle;
+    private boolean mBeamDisallowed;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -45,6 +49,8 @@
         actionBar.setTitle(R.string.android_beam_settings_title);
 
         mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
+        mBeamDisallowed = ((UserManager) getActivity().getSystemService(Context.USER_SERVICE))
+                .hasUserRestriction(UserManager.DISALLOW_OUTGOING_BEAM);
     }
 
     @Override
@@ -62,8 +68,9 @@
         SettingsActivity activity = (SettingsActivity) getActivity();
 
         mSwitchBar = activity.getSwitchBar();
-        mSwitchBar.setChecked(mNfcAdapter.isNdefPushEnabled());
+        mSwitchBar.setChecked(!mBeamDisallowed && mNfcAdapter.isNdefPushEnabled());
         mSwitchBar.addOnSwitchChangeListener(this);
+        mSwitchBar.setEnabled(!mBeamDisallowed);
         mSwitchBar.show();
     }
 
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index 2fb95e4..ae61b13 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -21,10 +21,11 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.nfc.NfcAdapter;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
-
 import android.preference.SwitchPreference;
+
 import com.android.settings.R;
 
 /**
@@ -38,6 +39,7 @@
     private final PreferenceScreen mAndroidBeam;
     private final NfcAdapter mNfcAdapter;
     private final IntentFilter mIntentFilter;
+    private boolean mBeamDisallowed;
 
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
@@ -56,6 +58,8 @@
         mSwitch = switchPreference;
         mAndroidBeam = androidBeam;
         mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
+        mBeamDisallowed = ((UserManager) mContext.getSystemService(Context.USER_SERVICE))
+                .hasUserRestriction(UserManager.DISALLOW_OUTGOING_BEAM);
 
         if (mNfcAdapter == null) {
             // NFC is not supported
@@ -64,6 +68,9 @@
             mIntentFilter = null;
             return;
         }
+        if (mBeamDisallowed) {
+            mAndroidBeam.setEnabled(false);
+        }
         mIntentFilter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
     }
 
@@ -110,8 +117,8 @@
         case NfcAdapter.STATE_ON:
             mSwitch.setChecked(true);
             mSwitch.setEnabled(true);
-            mAndroidBeam.setEnabled(true);
-            if (mNfcAdapter.isNdefPushEnabled()) {
+            mAndroidBeam.setEnabled(!mBeamDisallowed);
+            if (mNfcAdapter.isNdefPushEnabled() && !mBeamDisallowed) {
                 mAndroidBeam.setSummary(R.string.android_beam_on_summary);
             } else {
                 mAndroidBeam.setSummary(R.string.android_beam_off_summary);
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index efa43cd..0eeefa9 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -39,6 +39,7 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 import com.android.settings.notification.NotificationAppList.AppRow;
 import com.android.settings.notification.NotificationAppList.Backend;
 
@@ -136,11 +137,13 @@
         mSensitive = (SwitchPreference) findPreference(KEY_SENSITIVE);
 
         final boolean secure = new LockPatternUtils(getActivity()).isSecure();
-        if (!secure) {
+        final boolean enabled = getLockscreenNotificationsEnabled();
+        final boolean allowPrivate = getLockscreenAllowPrivateNotifications();
+        if (!secure || !enabled || !allowPrivate) {
             getPreferenceScreen().removePreference(mSensitive);
         }
 
-        mAppRow = NotificationAppList.loadAppRow(pm, info, mBackend);
+        mAppRow = NotificationAppList.loadAppRow(pm, info.applicationInfo, mBackend);
         if (intent.hasExtra(EXTRA_HAS_SETTINGS_INTENT)) {
             // use settings intent from extra
             if (intent.getBooleanExtra(EXTRA_HAS_SETTINGS_INTENT, false)) {
@@ -184,6 +187,22 @@
                 }
             });
         }
+
+        // Users cannot block notifications from system/signature packages
+        if (Utils.isSystemPackage(pm, info)) {
+            getPreferenceScreen().removePreference(mBlock);
+            mPriority.setDependency(null); // don't have it depend on a preference that's gone
+        }
+    }
+
+    private boolean getLockscreenNotificationsEnabled() {
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0;
+    }
+
+    private boolean getLockscreenAllowPrivateNotifications() {
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0) != 0;
     }
 
     private void toastAndFinish() {
@@ -199,7 +218,7 @@
                 final String p = packages[i];
                 if (pkg.equals(p)) {
                     try {
-                        return pm.getPackageInfo(pkg, 0);
+                        return pm.getPackageInfo(pkg, PackageManager.GET_SIGNATURES);
                     } catch (NameNotFoundException e) {
                         Log.w(TAG, "Failed to load package " + pkg, e);
                     }
diff --git a/src/com/android/settings/notification/NotificationAppList.java b/src/com/android/settings/notification/NotificationAppList.java
index 7ca4b18..3c44196 100644
--- a/src/com/android/settings/notification/NotificationAppList.java
+++ b/src/com/android/settings/notification/NotificationAppList.java
@@ -26,9 +26,9 @@
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
+import android.content.pm.LauncherActivityInfo;
+import android.content.pm.LauncherApps;
 import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.content.pm.Signature;
 import android.graphics.drawable.Drawable;
@@ -41,6 +41,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.service.notification.NotificationListenerService;
 import android.util.ArrayMap;
 import android.util.Log;
 import android.util.TypedValue;
@@ -94,12 +95,19 @@
     private Backend mBackend = new Backend();
     private UserSpinnerAdapter mProfileSpinnerAdapter;
 
+    private PackageManager mPM;
+    private UserManager mUM;
+    private LauncherApps mLauncherApps;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mContext = getActivity();
         mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mAdapter = new NotificationAppAdapter(mContext);
+        mUM = UserManager.get(mContext);
+        mPM = mContext.getPackageManager();
+        mLauncherApps = (LauncherApps) mContext.getSystemService(Context.LAUNCHER_APPS_SERVICE);
         getActivity().setTitle(R.string.app_notifications_title);
     }
 
@@ -112,8 +120,7 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
-        mProfileSpinnerAdapter = Utils.createUserSpinnerAdapter(um, mContext);
+        mProfileSpinnerAdapter = Utils.createUserSpinnerAdapter(mUM, mContext);
         if (mProfileSpinnerAdapter != null) {
             Spinner spinner = (Spinner) getActivity().getLayoutInflater().inflate(
                     R.layout.spinner_view, null);
@@ -155,8 +162,8 @@
         if (selectedUser.getIdentifier() != UserHandle.myUserId()) {
             Intent intent = new Intent(getActivity(), NotificationAppListActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
             mContext.startActivityAsUser(intent, selectedUser);
-            getActivity().finish();
         }
     }
 
@@ -351,7 +358,6 @@
         public boolean priority;
         public boolean sensitive;
         public boolean first;  // first app in section
-        public boolean isSystem;
     }
 
     private static final Comparator<AppRow> mRowComparator = new Comparator<AppRow>() {
@@ -363,21 +369,21 @@
     };
 
 
-    public static AppRow loadAppRow(PackageManager pm, PackageInfo pkg, Backend backend) {
+    public static AppRow loadAppRow(PackageManager pm, ApplicationInfo app,
+            Backend backend) {
         final AppRow row = new AppRow();
-        row.pkg = pkg.packageName;
-        row.uid = pkg.applicationInfo.uid;
+        row.pkg = app.packageName;
+        row.uid = app.uid;
         try {
-            row.label = pkg.applicationInfo.loadLabel(pm);
+            row.label = app.loadLabel(pm);
         } catch (Throwable t) {
             Log.e(TAG, "Error loading application label for " + row.pkg, t);
             row.label = row.pkg;
         }
-        row.icon = pkg.applicationInfo.loadIcon(pm);
+        row.icon = app.loadIcon(pm);
         row.banned = backend.getNotificationsBanned(row.pkg, row.uid);
         row.priority = backend.getHighPriority(row.pkg, row.uid);
         row.sensitive = backend.getSensitive(row.pkg, row.uid);
-        row.isSystem = Utils.isSystemPackage(pm, pkg);
         return row;
     }
 
@@ -430,40 +436,40 @@
                 mSortedRows.clear();
 
                 // collect all launchable apps, plus any packages that have notification settings
-                final PackageManager pm = mContext.getPackageManager();
-                final List<ResolveInfo> resolvedApps = pm.queryIntentActivities(
-                        new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER),
-                        PackageManager.MATCH_DEFAULT_ONLY
-                );
-                final List<ResolveInfo> resolvedConfigActivities
-                        = queryNotificationConfigActivities(pm);
-                resolvedApps.addAll(resolvedConfigActivities);
+                final List<ApplicationInfo> appInfos = new ArrayList<ApplicationInfo>();
 
-                for (ResolveInfo info : resolvedApps) {
-                    String pkgName = info.activityInfo.packageName;
-                    if (mRows.containsKey(pkgName)) {
+                final List<LauncherActivityInfo> lais
+                        = mLauncherApps.getActivityList(null /* all */,
+                            UserHandle.getCallingUserHandle());
+                if (DEBUG) Log.d(TAG, "  launchable activities:");
+                for (LauncherActivityInfo lai : lais) {
+                    if (DEBUG) Log.d(TAG, "    " + lai.getComponentName().toString());
+                    appInfos.add(lai.getApplicationInfo());
+                }
+
+                final List<ResolveInfo> resolvedConfigActivities
+                        = queryNotificationConfigActivities(mPM);
+                if (DEBUG) Log.d(TAG, "  config activities:");
+                for (ResolveInfo ri : resolvedConfigActivities) {
+                    if (DEBUG) Log.d(TAG, "    "
+                            + ri.activityInfo.packageName + "/" + ri.activityInfo.name);
+                    appInfos.add(ri.activityInfo.applicationInfo);
+                }
+
+                for (ApplicationInfo info : appInfos) {
+                    final String key = info.packageName;
+                    if (mRows.containsKey(key)) {
                         // we already have this app, thanks
                         continue;
                     }
 
-                    PackageInfo pkg = null;
-                    try {
-                        pkg = pm.getPackageInfo(pkgName,
-                                PackageManager.GET_SIGNATURES);
-                    } catch (NameNotFoundException e) {
-                        if (DEBUG) Log.d(TAG, "Skipping (NNFE): " + pkg.packageName);
-                        continue;
-                    }
-                    if (info.activityInfo.applicationInfo == null) {
-                        if (DEBUG) Log.d(TAG, "Skipping (no applicationInfo): " + pkg.packageName);
-                        continue;
-                    }
-                    final AppRow row = loadAppRow(pm, pkg, mBackend);
-                    mRows.put(pkgName, row);
+                    final AppRow row = loadAppRow(mPM, info, mBackend);
+                    mRows.put(key, row);
                 }
 
                 // add config activities to the list
-                applyConfigActivities(pm, mRows, resolvedConfigActivities);
+                applyConfigActivities(mPM, mRows, resolvedConfigActivities);
+
                 // sort rows
                 mSortedRows.addAll(mRows.values());
                 Collections.sort(mSortedRows, mRowComparator);
@@ -521,11 +527,12 @@
     };
 
     public static class Backend {
+        static INotificationManager sINM = INotificationManager.Stub.asInterface(
+                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+
         public boolean setNotificationsBanned(String pkg, int uid, boolean banned) {
-            INotificationManager nm = INotificationManager.Stub.asInterface(
-                    ServiceManager.getService(Context.NOTIFICATION_SERVICE));
             try {
-                nm.setNotificationsEnabledForPackage(pkg, uid, !banned);
+                sINM.setNotificationsEnabledForPackage(pkg, uid, !banned);
                 return true;
             } catch (Exception e) {
                Log.w(TAG, "Error calling NoMan", e);
@@ -534,10 +541,8 @@
         }
 
         public boolean getNotificationsBanned(String pkg, int uid) {
-            INotificationManager nm = INotificationManager.Stub.asInterface(
-                    ServiceManager.getService(Context.NOTIFICATION_SERVICE));
             try {
-                final boolean enabled = nm.areNotificationsEnabledForPackage(pkg, uid);
+                final boolean enabled = sINM.areNotificationsEnabledForPackage(pkg, uid);
                 return !enabled;
             } catch (Exception e) {
                 Log.w(TAG, "Error calling NoMan", e);
@@ -546,10 +551,8 @@
         }
 
         public boolean getHighPriority(String pkg, int uid) {
-            INotificationManager nm = INotificationManager.Stub.asInterface(
-                    ServiceManager.getService(Context.NOTIFICATION_SERVICE));
             try {
-                return nm.getPackagePriority(pkg, uid) == Notification.PRIORITY_MAX;
+                return sINM.getPackagePriority(pkg, uid) == Notification.PRIORITY_MAX;
             } catch (Exception e) {
                 Log.w(TAG, "Error calling NoMan", e);
                 return false;
@@ -557,10 +560,8 @@
         }
 
         public boolean setHighPriority(String pkg, int uid, boolean highPriority) {
-            INotificationManager nm = INotificationManager.Stub.asInterface(
-                    ServiceManager.getService(Context.NOTIFICATION_SERVICE));
             try {
-                nm.setPackagePriority(pkg, uid,
+                sINM.setPackagePriority(pkg, uid,
                         highPriority ? Notification.PRIORITY_MAX : Notification.PRIORITY_DEFAULT);
                 return true;
             } catch (Exception e) {
@@ -570,13 +571,24 @@
         }
 
         public boolean getSensitive(String pkg, int uid) {
-            // TODO get visibility state from NoMan
-            return false;
+            try {
+                return sINM.getPackageVisibilityOverride(pkg, uid) == Notification.VISIBILITY_PRIVATE;
+            } catch (Exception e) {
+                Log.w(TAG, "Error calling NoMan", e);
+                return false;
+            }
         }
 
         public boolean setSensitive(String pkg, int uid, boolean sensitive) {
-            // TODO save visibility state to NoMan
-            return true;
+            try {
+                sINM.setPackageVisibilityOverride(pkg, uid,
+                        sensitive ? Notification.VISIBILITY_PRIVATE
+                                : NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE);
+                return true;
+            } catch (Exception e) {
+                Log.w(TAG, "Error calling NoMan", e);
+                return false;
+            }
         }
     }
 }
diff --git a/src/com/android/settings/notification/NotificationSettings.java b/src/com/android/settings/notification/NotificationSettings.java
index 3094032..6899440 100644
--- a/src/com/android/settings/notification/NotificationSettings.java
+++ b/src/com/android/settings/notification/NotificationSettings.java
@@ -37,6 +37,7 @@
 import android.preference.SeekBarVolumizer;
 import android.preference.TwoStatePreference;
 import android.provider.MediaStore;
+import android.provider.OpenableColumns;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.util.Log;
@@ -238,11 +239,16 @@
         if (ringtoneUri == null) {
             summary = context.getString(com.android.internal.R.string.ringtone_silent);
         } else {
-            // Fetch the ringtone title from the media provider
             Cursor cursor = null;
             try {
-                cursor = context.getContentResolver().query(ringtoneUri,
-                        new String[] { MediaStore.Audio.Media.TITLE }, null, null, null);
+                if (MediaStore.AUTHORITY.equals(ringtoneUri.getAuthority())) {
+                    // Fetch the ringtone title from the media provider
+                    cursor = context.getContentResolver().query(ringtoneUri,
+                            new String[] { MediaStore.Audio.Media.TITLE }, null, null, null);
+                } else if (ContentResolver.SCHEME_CONTENT.equals(ringtoneUri.getScheme())) {
+                    cursor = context.getContentResolver().query(ringtoneUri,
+                            new String[] { OpenableColumns.DISPLAY_NAME }, null, null, null);
+                }
                 if (cursor != null) {
                     if (cursor.moveToFirst()) {
                         summary = cursor.getString(0);
@@ -250,6 +256,8 @@
                 }
             } catch (SQLiteException sqle) {
                 // Unknown title for the ringtone
+            } catch (IllegalArgumentException iae) {
+                // Some other error retrieving the column from the provider
             } finally {
                 if (cursor != null) {
                     cursor.close();
diff --git a/src/com/android/settings/notification/SettingPref.java b/src/com/android/settings/notification/SettingPref.java
index de01def..a06c35a 100644
--- a/src/com/android/settings/notification/SettingPref.java
+++ b/src/com/android/settings/notification/SettingPref.java
@@ -33,15 +33,15 @@
     public static final int TYPE_GLOBAL = 1;
     public static final int TYPE_SYSTEM = 2;
 
-    private final int mType;
+    protected final int mType;
     private final String mKey;
-    private final String mSetting;
-    private final int mDefault;
+    protected final String mSetting;
+    protected final int mDefault;
     private final int[] mValues;
     private final Uri mUri;
 
-    private TwoStatePreference mTwoState;
-    private DropDownPreference mDropDown;
+    protected TwoStatePreference mTwoState;
+    protected DropDownPreference mDropDown;
 
     public SettingPref(int type, String key, String setting, int def, int... values) {
         mType = type;
@@ -129,7 +129,7 @@
         throw new IllegalArgumentException();
     }
 
-    private static boolean putInt(int type, ContentResolver cr, String setting, int value) {
+    protected static boolean putInt(int type, ContentResolver cr, String setting, int value) {
         switch(type) {
             case TYPE_GLOBAL:
                 return Global.putInt(cr, setting, value);
@@ -139,7 +139,7 @@
         throw new IllegalArgumentException();
     }
 
-    private static int getInt(int type, ContentResolver cr, String setting, int def) {
+    protected static int getInt(int type, ContentResolver cr, String setting, int def) {
         switch(type) {
             case TYPE_GLOBAL:
                 return Global.getInt(cr, setting, def);
diff --git a/src/com/android/settings/notification/ZenModeConditionSelection.java b/src/com/android/settings/notification/ZenModeConditionSelection.java
index 610baba..856a7f6 100644
--- a/src/com/android/settings/notification/ZenModeConditionSelection.java
+++ b/src/com/android/settings/notification/ZenModeConditionSelection.java
@@ -19,13 +19,13 @@
 import android.animation.LayoutTransition;
 import android.app.INotificationManager;
 import android.content.Context;
-import android.net.Uri;
 import android.os.Handler;
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.service.notification.Condition;
 import android.service.notification.IConditionListener;
+import android.service.notification.ZenModeConfig;
 import android.util.Log;
 import android.widget.CompoundButton;
 import android.widget.RadioButton;
@@ -33,6 +33,9 @@
 
 import com.android.settings.R;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ZenModeConditionSelection extends RadioGroup {
     private static final String TAG = "ZenModeConditionSelection";
     private static final boolean DEBUG = true;
@@ -40,18 +43,24 @@
     private final INotificationManager mNoMan;
     private final H mHandler = new H();
     private final Context mContext;
+    private final List<Condition> mConditions;
+    private Condition mCondition;
 
     public ZenModeConditionSelection(Context context) {
         super(context);
         mContext = context;
+        mConditions = new ArrayList<Condition>();
         setLayoutTransition(new LayoutTransition());
         final int p = mContext.getResources().getDimensionPixelSize(R.dimen.content_margin_left);
         setPadding(p, p, p, 0);
         mNoMan = INotificationManager.Stub.asInterface(
                 ServiceManager.getService(Context.NOTIFICATION_SERVICE));
         final RadioButton b = newRadioButton(null);
-        b.setText(R.string.zen_mode_default_option);
+        b.setText(mContext.getString(com.android.internal.R.string.zen_mode_forever));
         b.setChecked(true);
+        for (int i = ZenModeConfig.MINUTE_BUCKETS.length - 1; i >= 0; --i) {
+            handleCondition(ZenModeConfig.toTimeCondition(ZenModeConfig.MINUTE_BUCKETS[i]));
+        }
     }
 
     private RadioButton newRadioButton(Condition condition) {
@@ -61,7 +70,7 @@
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (isChecked) {
-                    handleSubscribe((Condition) button.getTag());
+                    setCondition((Condition) button.getTag());
                 }
             }
         });
@@ -91,24 +100,35 @@
     }
 
     protected void handleConditions(Condition[] conditions) {
-        for (final Condition c : conditions) {
-            RadioButton v = (RadioButton) findViewWithTag(c.id);
-            if (c.state == Condition.STATE_TRUE || c.state == Condition.STATE_UNKNOWN) {
-                if (v == null) {
-                    v = newRadioButton(c);
-                }
-            }
-            if (v != null) {
-                v.setText(c.summary);
-                v.setEnabled(c.state == Condition.STATE_TRUE);
-            }
+        for (Condition c : conditions) {
+            handleCondition(c);
         }
     }
 
-    protected void handleSubscribe(Condition c) {
-        if (DEBUG) Log.d(TAG, "handleSubscribe " + c);
+    protected void handleCondition(Condition c) {
+        if (mConditions.contains(c)) return;
+        RadioButton v = (RadioButton) findViewWithTag(c.id);
+        if (c.state == Condition.STATE_TRUE || c.state == Condition.STATE_UNKNOWN) {
+            if (v == null) {
+                v = newRadioButton(c);
+            }
+        }
+        if (v != null) {
+            v.setText(c.summary);
+            v.setEnabled(c.state == Condition.STATE_TRUE);
+        }
+        mConditions.add(c);
+    }
+
+    protected void setCondition(Condition c) {
+        if (DEBUG) Log.d(TAG, "setCondition " + c);
+        mCondition = c;
+    }
+
+    public void confirmCondition() {
+        if (DEBUG) Log.d(TAG, "confirmCondition " + mCondition);
         try {
-            mNoMan.setZenModeCondition(c);
+            mNoMan.setZenModeCondition(mCondition);
         } catch (RemoteException e) {
             // noop
         }
@@ -127,7 +147,7 @@
 
         @Override
         public void handleMessage(Message msg) {
-            if (msg.what == CONDITIONS) handleConditions((Condition[])msg.obj);
+            if (msg.what == CONDITIONS) handleConditions((Condition[]) msg.obj);
         }
     }
 }
diff --git a/src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java b/src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java
index 74dae9e0..3361ad0 100644
--- a/src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java
+++ b/src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java
@@ -22,6 +22,7 @@
 import android.view.LayoutInflater;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.ScrollView;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.LinearLayout;
 
@@ -30,24 +31,29 @@
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
-public class ZenModeDowntimeDaysSelection extends LinearLayout {
-    private static final int[] DAYS = {
+public class ZenModeDowntimeDaysSelection extends ScrollView {
+    public static final int[] DAYS = {
         Calendar.MONDAY, Calendar.TUESDAY, Calendar.WEDNESDAY, Calendar.THURSDAY, Calendar.FRIDAY,
         Calendar.SATURDAY, Calendar.SUNDAY
     };
     private static final SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("EEEE");
 
     private final SparseBooleanArray mDays = new SparseBooleanArray();
+    private final LinearLayout mLayout;
 
     public ZenModeDowntimeDaysSelection(Context context, String mode) {
         super(context);
+        mLayout = new LinearLayout(mContext);
+        final int hPad = context.getResources().getDimensionPixelSize(R.dimen.zen_downtime_margin);
+        mLayout.setPadding(hPad, 0, hPad, 0);
+        addView(mLayout);
         final int[] days = ZenModeConfig.tryParseDays(mode);
         if (days != null) {
             for (int i = 0; i < days.length; i++) {
                 mDays.put(days[i], true);
             }
         }
-        setOrientation(VERTICAL);
+        mLayout.setOrientation(LinearLayout.VERTICAL);
         final Calendar c = Calendar.getInstance();
         final LayoutInflater inflater = LayoutInflater.from(context);
         for (int i = 0; i < DAYS.length; i++) {
@@ -64,7 +70,7 @@
                     onChanged(getMode());
                 }
             });
-            addView(checkBox);
+            mLayout.addView(checkBox);
         }
     }
 
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 5e24b9d..091e121 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.notification;
 
+import static com.android.settings.notification.ZenModeDowntimeDaysSelection.DAYS;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -44,11 +46,13 @@
 import android.text.format.DateFormat;
 import android.util.Log;
 import android.util.SparseArray;
+import android.widget.ScrollView;
 import android.widget.TimePicker;
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.notification.DropDownPreference.Callback;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
@@ -79,9 +83,10 @@
     private static final String KEY_ENTRY = "entry";
     private static final String KEY_CONDITION_PROVIDERS = "manage_condition_providers";
 
-    private static final SettingPref PREF_ZEN_MODE = new SettingPref(SettingPref.TYPE_GLOBAL,
-            KEY_ZEN_MODE, Global.ZEN_MODE, Global.ZEN_MODE_OFF, Global.ZEN_MODE_OFF,
-            Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, Global.ZEN_MODE_NO_INTERRUPTIONS) {
+    private static final SettingPrefWithCallback PREF_ZEN_MODE = new SettingPrefWithCallback(
+            SettingPref.TYPE_GLOBAL, KEY_ZEN_MODE, Global.ZEN_MODE, Global.ZEN_MODE_OFF,
+            Global.ZEN_MODE_OFF, Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS,
+            Global.ZEN_MODE_NO_INTERRUPTIONS) {
         protected String getCaption(Resources res, int value) {
             switch (value) {
                 case Global.ZEN_MODE_NO_INTERRUPTIONS:
@@ -133,6 +138,7 @@
     private PreferenceCategory mAutomationCategory;
     private Preference mEntry;
     private Preference mConditionProviders;
+    private AlertDialog mDialog;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -147,6 +153,14 @@
         if (DEBUG) Log.d(TAG, "Loaded mConfig=" + mConfig);
 
         final Preference zenMode = PREF_ZEN_MODE.init(this);
+        PREF_ZEN_MODE.setCallback(new SettingPrefWithCallback.Callback() {
+            @Override
+            public void onSettingSelected(int value) {
+                if (value != Global.ZEN_MODE_OFF) {
+                    showConditionSelection(value);
+                }
+            }
+        });
         if (!Utils.isVoiceCapable(mContext)) {
             zenMode.setTitle(R.string.zen_mode_option_title_novoice);
         }
@@ -188,7 +202,6 @@
         });
 
         mStarred = (DropDownPreference) important.findPreference(KEY_STARRED);
-        mStarred.setDropDownWidth(R.dimen.zen_mode_dropdown_width);
         mStarred.addItem(R.string.zen_mode_from_anyone, ZenModeConfig.SOURCE_ANYONE);
         mStarred.addItem(R.string.zen_mode_from_starred, ZenModeConfig.SOURCE_STAR);
         mStarred.addItem(R.string.zen_mode_from_contacts, ZenModeConfig.SOURCE_CONTACT);
@@ -314,8 +327,8 @@
             if (days != null && days.length != 0) {
                 final StringBuilder sb = new StringBuilder();
                 final Calendar c = Calendar.getInstance();
-                for (int i = 0; i < ZenModeConfig.ALL_DAYS.length; i++) {
-                    final int day = ZenModeConfig.ALL_DAYS[i];
+                for (int i = 0; i < DAYS.length; i++) {
+                    final int day = DAYS[i];
                     for (int j = 0; j < days.length; j++) {
                         if (day == days[j]) {
                             c.set(Calendar.DAY_OF_WEEK, day);
@@ -465,8 +478,44 @@
         Global.putInt(getContentResolver(), Global.ZEN_MODE, value);
     }
 
-    protected ZenModeConditionSelection newConditionSelection() {
-        return new ZenModeConditionSelection(mContext);
+    protected void showConditionSelection(final int newSettingsValue) {
+        if (mDialog != null) return;
+
+        final ZenModeConditionSelection zenModeConditionSelection =
+                new ZenModeConditionSelection(mContext);
+        DialogInterface.OnClickListener positiveListener = new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                zenModeConditionSelection.confirmCondition();
+                mDialog = null;
+            }
+        };
+        final int oldSettingsValue = PREF_ZEN_MODE.getValue(mContext);
+        ScrollView scrollView = new ScrollView(mContext);
+        scrollView.addView(zenModeConditionSelection);
+        mDialog = new AlertDialog.Builder(getActivity())
+                .setTitle(PREF_ZEN_MODE.getCaption(getResources(), newSettingsValue))
+                .setView(scrollView)
+                .setPositiveButton(R.string.okay, positiveListener)
+                .setNegativeButton(R.string.cancel_all_caps, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        cancelDialog(oldSettingsValue);
+                    }
+                })
+                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    @Override
+                    public void onCancel(DialogInterface dialog) {
+                        cancelDialog(oldSettingsValue);
+                    }
+                }).create();
+        mDialog.show();
+    }
+
+    protected void cancelDialog(int oldSettingsValue) {
+        // If not making a decision, reset drop down to current setting.
+        PREF_ZEN_MODE.setValueWithoutCallback(mContext, oldSettingsValue);
+        mDialog = null;
     }
 
     // Enable indexing of searchable data
@@ -497,6 +546,60 @@
             }
         };
 
+    private static class SettingPrefWithCallback extends SettingPref {
+
+        private Callback mCallback;
+        private int mValue;
+
+        public SettingPrefWithCallback(int type, String key, String setting, int def,
+                int... values) {
+            super(type, key, setting, def, values);
+        }
+
+        public void setCallback(Callback callback) {
+            mCallback = callback;
+        }
+
+        @Override
+        public void update(Context context) {
+            // Avoid callbacks from non-user changes.
+            mValue = getValue(context);
+            super.update(context);
+        }
+
+        @Override
+        protected boolean setSetting(Context context, int value) {
+            if (value == mValue) return true;
+            mValue = value;
+            if (mCallback != null) {
+                mCallback.onSettingSelected(value);
+            }
+            return super.setSetting(context, value);
+        }
+
+        @Override
+        public Preference init(SettingsPreferenceFragment settings) {
+            Preference ret = super.init(settings);
+            mValue = getValue(settings.getActivity());
+
+            return ret;
+        }
+
+        public boolean setValueWithoutCallback(Context context, int value) {
+            // Set the current value ahead of time, this way we won't trigger a callback.
+            mValue = value;
+            return putInt(mType, context.getContentResolver(), mSetting, value);
+        }
+
+        public int getValue(Context context) {
+            return getInt(mType, context.getContentResolver(), mSetting, mDefault);
+        }
+
+        public interface Callback {
+            void onSettingSelected(int value);
+        }
+    }
+
     private final class SettingsObserver extends ContentObserver {
         private final Uri ZEN_MODE_URI = Global.getUriFor(Global.ZEN_MODE);
         private final Uri ZEN_MODE_CONFIG_ETAG_URI = Global.getUriFor(Global.ZEN_MODE_CONFIG_ETAG);
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index cbe70ae..a72fa7d 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -112,13 +112,13 @@
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
 
-        if (!mPrintJob.getInfo().isCancelling()) {
+        if (!getPrintJob().getInfo().isCancelling()) {
             MenuItem cancel = menu.add(0, MENU_ITEM_ID_CANCEL, Menu.NONE,
                     getString(R.string.print_cancel));
             cancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         }
 
-        if (mPrintJob.isFailed()) {
+        if (getPrintJob().isFailed()) {
             MenuItem restart = menu.add(0, MENU_ITEM_ID_RESTART, Menu.NONE,
                     getString(R.string.print_restart));
             restart.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
@@ -129,13 +129,13 @@
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case MENU_ITEM_ID_CANCEL: {
-                mPrintJob.cancel();
+                getPrintJob().cancel();
                 finish();
                 return true;
             }
 
             case MENU_ITEM_ID_RESTART: {
-                mPrintJob.restart();
+                getPrintJob().restart();
                 finish();
                 return true;
             }
@@ -152,25 +152,32 @@
         }
     }
 
-    private void updateUi() {
-        mPrintJob = mPrintManager.getPrintJob(mPrintJobId);
-
+    private PrintJob getPrintJob() {
         if (mPrintJob == null) {
+            mPrintJob = mPrintManager.getPrintJob(mPrintJobId);
+        }
+        return mPrintJob;
+    }
+
+    private void updateUi() {
+        PrintJob printJob = getPrintJob();
+
+        if (printJob == null) {
             finish();
             return;
         }
 
-        if (mPrintJob.isCancelled() || mPrintJob.isCompleted()) {
+        if (printJob.isCancelled() || printJob.isCompleted()) {
             finish();
             return;
         }
 
-        PrintJobInfo info = mPrintJob.getInfo();
+        PrintJobInfo info = printJob.getInfo();
 
         switch (info.getState()) {
             case PrintJobInfo.STATE_QUEUED:
             case PrintJobInfo.STATE_STARTED: {
-                if (!mPrintJob.getInfo().isCancelling()) {
+                if (!printJob.getInfo().isCancelling()) {
                     mPrintJobPreference.setTitle(getString(
                             R.string.print_printing_state_title_template, info.getLabel()));
                 } else {
@@ -185,7 +192,7 @@
             } break;
 
             case PrintJobInfo.STATE_BLOCKED: {
-                if (!mPrintJob.getInfo().isCancelling()) {
+                if (!printJob.getInfo().isCancelling()) {
                     mPrintJobPreference.setTitle(getString(
                             R.string.print_blocked_state_title_template, info.getLabel()));
                 } else {
@@ -203,12 +210,12 @@
         switch (info.getState()) {
             case PrintJobInfo.STATE_QUEUED:
             case PrintJobInfo.STATE_STARTED: {
-                mPrintJobPreference.setIcon(com.android.internal.R.drawable.ic_print);
+                mPrintJobPreference.setIcon(R.drawable.ic_print);
             } break;
 
             case PrintJobInfo.STATE_FAILED:
             case PrintJobInfo.STATE_BLOCKED: {
-                mPrintJobPreference.setIcon(com.android.internal.R.drawable.ic_print_error);
+                mPrintJobPreference.setIcon(R.drawable.ic_print_error);
             } break;
         }
 
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 2acc733..4a34875 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -298,8 +298,8 @@
         if (selectedUser.getIdentifier() != UserHandle.myUserId()) {
             Intent intent = new Intent(Settings.ACTION_PRINT_SETTINGS);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
             getActivity().startActivityAsUser(intent, selectedUser);
-            getActivity().finish();
         }
     }
 
@@ -423,12 +423,12 @@
                     switch (printJob.getState()) {
                         case PrintJobInfo.STATE_QUEUED:
                         case PrintJobInfo.STATE_STARTED: {
-                            preference.setIcon(com.android.internal.R.drawable.ic_print);
+                            preference.setIcon(R.drawable.ic_print);
                         } break;
 
                         case PrintJobInfo.STATE_FAILED:
                         case PrintJobInfo.STATE_BLOCKED: {
-                            preference.setIcon(com.android.internal.R.drawable.ic_print_error);
+                            preference.setIcon(R.drawable.ic_print_error);
                         } break;
                     }
 
diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java
index db60dfe..3957cf6 100644
--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -185,6 +185,7 @@
             dataToUpdate = new ArrayList<SearchIndexableData>(other.dataToUpdate);
             dataToDelete = new ArrayList<SearchIndexableData>(other.dataToDelete);
             nonIndexableKeys = new HashMap<String, List<String>>(other.nonIndexableKeys);
+            forceUpdate = other.forceUpdate;
         }
 
         public UpdateData copy() {
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index abfeccb..836ea24 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -38,7 +38,7 @@
 import android.telephony.SubInfoRecord;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
-import android.telecomm.PhoneAccount;
+import android.telecom.PhoneAccount;
 import android.telephony.CellInfo;
 import android.text.TextUtils;
 import android.util.Log;
@@ -167,7 +167,7 @@
 
         for (int i = 0; i < availableSubInfoLength; ++i) {
             final SubInfoRecord sir = mAvailableSubInfos.get(i);
-            if (sir != null && sir.mSubId == subId) {
+            if (sir != null && sir.subId == subId) {
                 return sir;
             }
         }
@@ -185,7 +185,7 @@
 
             for (int i = 0; i < availableSubInfoLength; ++i) {
                 final SubInfoRecord sir = mSubInfoList.get(i);
-                if (sir.mSlotId == slotId) {
+                if (sir.slotId == slotId) {
                     //Right now we take the first subscription on a SIM.
                     return sir;
                 }
@@ -199,7 +199,7 @@
         final DropDownPreference simPref = (DropDownPreference) findPreference(KEY_SMS);
         final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getDefaultSmsSubId());
         if (sir != null) {
-            simPref.setSelectedItem(sir.mSlotId + 1);
+            simPref.setSelectedItem(sir.slotId + 1);
         }
         simPref.setEnabled(mNumSims > 1);
     }
@@ -208,7 +208,7 @@
         final DropDownPreference simPref = (DropDownPreference) findPreference(KEY_CELLULAR_DATA);
         final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getDefaultDataSubId());
         if (sir != null) {
-            simPref.setSelectedItem(sir.mSlotId);
+            simPref.setSelectedItem(sir.slotId);
         }
         simPref.setEnabled(mNumSims > 1);
     }
@@ -217,7 +217,7 @@
         final DropDownPreference simPref = (DropDownPreference) findPreference(KEY_CALLS);
         final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getDefaultVoiceSubId());
         if (sir != null) {
-            simPref.setSelectedItem(sir.mSlotId + 1);
+            simPref.setSelectedItem(sir.slotId + 1);
         }
         simPref.setEnabled(mNumSims > 1);
     }
@@ -254,14 +254,14 @@
         for (int i = 0; i < subAvailableSize; ++i) {
             final SubInfoRecord sir = mAvailableSubInfos.get(i);
             if(sir != null){
-                simPref.addItem(sir.mDisplayName, sir);
+                simPref.addItem(sir.displayName, sir);
             }
         }
 
         simPref.setCallback(new DropDownPreference.Callback() {
             @Override
             public boolean onItemSelected(int pos, Object value) {
-                final long subId = value == null ? 0 : ((SubInfoRecord)value).mSubId;
+                final long subId = value == null ? 0 : ((SubInfoRecord)value).subId;
 
                 if (simPref.getKey().equals(KEY_CELLULAR_DATA)) {
                     SubscriptionManager.setDefaultDataSubId(subId);
@@ -310,7 +310,7 @@
             setTitle(res.getString(R.string.sim_card_number_title, mSlotId + 1));
             if (mSubInfoRecord != null) {
                 setSummary(res.getString(R.string.sim_settings_summary,
-                            mSubInfoRecord.mDisplayName, mSubInfoRecord.mNumber));
+                            mSubInfoRecord.displayName, mSubInfoRecord.number));
                 setEnabled(true);
             } else {
                 setSummary(R.string.sim_slot_empty);
@@ -327,13 +327,13 @@
             builder.setView(dialogLayout);
 
             EditText nameText = (EditText)dialogLayout.findViewById(R.id.sim_name);
-            nameText.setText(mSubInfoRecord.mDisplayName);
+            nameText.setText(mSubInfoRecord.displayName);
 
             TextView numberView = (TextView)dialogLayout.findViewById(R.id.number);
-            numberView.setText(mSubInfoRecord.mNumber);
+            numberView.setText(mSubInfoRecord.number);
 
             TextView carrierView = (TextView)dialogLayout.findViewById(R.id.carrier);
-            carrierView.setText(mSubInfoRecord.mDisplayName);
+            carrierView.setText(mSubInfoRecord.displayName);
 
             builder.setTitle(R.string.sim_editor_title);
 
@@ -347,11 +347,11 @@
                     SubscriptionManager.setDisplayNumberFormat(
                         displayNumbers.getSelectedItemPosition() == 0
                             ? SubscriptionManager.DISPLAY_NUMBER_LAST
-                            : SubscriptionManager.DISPLAY_NUMBER_FIRST, mSubInfoRecord.mSubId);
+                            : SubscriptionManager.DISPLAY_NUMBER_FIRST, mSubInfoRecord.subId);
 
-                    mSubInfoRecord.mDisplayName = nameText.getText().toString();
-                    SubscriptionManager.setDisplayName(mSubInfoRecord.mDisplayName,
-                        mSubInfoRecord.mSubId);
+                    mSubInfoRecord.displayName = nameText.getText().toString();
+                    SubscriptionManager.setDisplayName(mSubInfoRecord.displayName,
+                        mSubInfoRecord.subId);
 
                     updateAllOptions();
                     update();
diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/com/android/settings/users/EditUserPhotoController.java
index 538f332..82e550e 100644
--- a/src/com/android/settings/users/EditUserPhotoController.java
+++ b/src/com/android/settings/users/EditUserPhotoController.java
@@ -35,6 +35,7 @@
 import android.provider.MediaStore;
 import android.provider.ContactsContract.DisplayPhoto;
 import android.support.v4.content.FileProvider;
+import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.AdapterView;
@@ -48,11 +49,14 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
 public class EditUserPhotoController {
+    private static final String TAG = "EditUserPhotoController";
+
     private static final int POPUP_LIST_ITEM_ID_CHOOSE_PHOTO = 1;
     private static final int POPUP_LIST_ITEM_ID_TAKE_PHOTO = 2;
 
@@ -239,12 +243,22 @@
             @Override
             protected Bitmap doInBackground(Void... params) {
                 if (cropped) {
+                    InputStream imageStream = null;
                     try {
-                        InputStream imageStream = mContext.getContentResolver()
+                        imageStream = mContext.getContentResolver()
                                 .openInputStream(data);
                         return BitmapFactory.decodeStream(imageStream);
                     } catch (FileNotFoundException fe) {
+                        Log.w(TAG, "Cannot find image file", fe);
                         return null;
+                    } finally {
+                        if (imageStream != null) {
+                            try {
+                                imageStream.close();
+                            } catch (IOException ioe) {
+                                Log.w(TAG, "Cannot close image stream", ioe);
+                            }
+                        }
                     }
                 } else {
                     // Scale and crop to a square aspect ratio
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index f5ea6aa..0d7b279 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -16,10 +16,6 @@
 
 package com.android.settings.users;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Activity;
@@ -37,7 +33,6 @@
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -60,6 +55,7 @@
 import android.view.View.OnClickListener;
 import android.widget.SimpleAdapter;
 
+import com.android.internal.util.UserIcons;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.ChooseLockGeneric;
 import com.android.settings.OwnerInfoSettings;
@@ -70,6 +66,10 @@
 import com.android.settings.Utils;
 import com.android.settings.drawable.CircleFramedDrawable;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * Screen that manages the list of users on the device.
  * Guest user is an always visible entry, even if the guest is not currently
@@ -119,19 +119,6 @@
     private static final String KEY_ADD_USER_LONG_MESSAGE_DISPLAYED =
             "key_add_user_long_message_displayed";
 
-    static final int[] USER_DRAWABLES = {
-        R.drawable.ic_avatar_default_1,
-        R.drawable.ic_avatar_default_2,
-        R.drawable.ic_avatar_default_3,
-        R.drawable.ic_avatar_default_4,
-        R.drawable.ic_avatar_default_5,
-        R.drawable.ic_avatar_default_6,
-        R.drawable.ic_avatar_default_7,
-        R.drawable.ic_avatar_default_8
-    };
-
-    private static final int GUEST_DRAWABLE_ID = R.drawable.ic_avatar_guest;
-
     private static final String KEY_TITLE = "title";
     private static final String KEY_SUMMARY = "summary";
 
@@ -154,10 +141,8 @@
     private EditUserInfoController mEditUserInfoController =
             new EditUserInfoController();
 
-    // A place to cache the generated guest avatar
-    private Drawable mGuestDrawable;
     // A place to cache the generated default avatar
-    private Drawable mDefaultAvatarDrawable;
+    private Drawable mDefaultIconDrawable;
 
     private Handler mHandler = new Handler() {
         @Override
@@ -325,7 +310,7 @@
     private void loadProfile() {
         if (mIsGuest) {
             // No need to load profile information
-            mMePreference.setIcon(getEncircledGuestDrawable());
+            mMePreference.setIcon(getEncircledDefaultIcon());
             mMePreference.setTitle(R.string.user_exit_guest_title);
             return;
         }
@@ -423,9 +408,7 @@
         Secure.putIntForUser(getContentResolver(),
                 Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF, userId);
         mUserManager.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, true, user);
-        Bitmap bitmap = createBitmapFromDrawable(
-                USER_DRAWABLES[userId % UserSettings.USER_DRAWABLES.length]);
-        mUserManager.setUserIcon(userId, bitmap);
+        assignDefaultPhoto(newUserInfo);
         // Add shared accounts
         AccountManager am = AccountManager.get(getActivity());
         Account [] accounts = am.getAccounts();
@@ -437,15 +420,6 @@
         return newUserInfo;
     }
 
-    private Bitmap createBitmapFromDrawable(int resId) {
-        Drawable icon = getResources().getDrawable(resId);
-        icon.setBounds(0, 0, icon.getIntrinsicWidth(), icon.getIntrinsicHeight());
-        Bitmap bitmap = Bitmap.createBitmap(icon.getIntrinsicWidth(), icon.getIntrinsicHeight(),
-                Bitmap.Config.ARGB_8888);
-        icon.draw(new Canvas(bitmap));
-        return bitmap;
-    }
-
     private UserInfo createTrustedUser() {
         UserInfo newUserInfo = mUserManager.createUser(
                 getResources().getString(R.string.user_new_user_name), 0);
@@ -787,13 +761,15 @@
             }
             if (user.iconPath != null) {
                 if (mUserIcons.get(user.id) == null) {
+                    // Icon not loaded yet, print a placeholder
                     missingIcons.add(user.id);
-                    pref.setIcon(getEncircledDefaultAvatar());
+                    pref.setIcon(getEncircledDefaultIcon());
                 } else {
                     setPhotoId(pref, user);
                 }
             } else {
-                pref.setIcon(getEncircledDefaultAvatar());
+                // Icon not available yet, print a placeholder
+                pref.setIcon(getEncircledDefaultIcon());
             }
         }
 
@@ -803,7 +779,7 @@
                     null, null);
             pref.setEnabled(false);
             pref.setTitle(R.string.user_new_user_name);
-            pref.setIcon(getEncircledDefaultAvatar());
+            pref.setIcon(getEncircledDefaultIcon());
             mUserListCategory.addPreference(pref);
         }
 
@@ -826,7 +802,7 @@
                     mIsOwner && voiceCapable? this : null /* settings icon handler */,
                     null /* delete icon handler */);
             pref.setTitle(R.string.user_guest);
-            pref.setIcon(getEncircledGuestDrawable());
+            pref.setIcon(getEncircledDefaultIcon());
             pref.setOnPreferenceClickListener(this);
             mUserListCategory.addPreference(pref);
         }
@@ -854,7 +830,8 @@
                 for (int userId : values[0]) {
                     Bitmap bitmap = mUserManager.getUserIcon(userId);
                     if (bitmap == null) {
-                        bitmap = createBitmapFromDrawable(R.drawable.ic_avatar_default_1);
+                        bitmap = UserIcons.convertToBitmap(UserIcons.getDefaultUserIcon(userId,
+                                /* light= */ false));
                     }
                     mUserIcons.append(userId, bitmap);
                 }
@@ -870,24 +847,17 @@
     }
 
     private void assignDefaultPhoto(UserInfo user) {
-        Bitmap bitmap = createBitmapFromDrawable(
-                USER_DRAWABLES[user.id % UserSettings.USER_DRAWABLES.length]);
+        Bitmap bitmap = UserIcons.convertToBitmap(UserIcons.getDefaultUserIcon(user.id,
+                /* light= */ false));
         mUserManager.setUserIcon(user.id, bitmap);
     }
 
-    private Drawable getEncircledGuestDrawable() {
-        if (mGuestDrawable == null) {
-            mGuestDrawable = encircle(createBitmapFromDrawable(GUEST_DRAWABLE_ID));
+    private Drawable getEncircledDefaultIcon() {
+        if (mDefaultIconDrawable == null) {
+            mDefaultIconDrawable = encircle(UserIcons.convertToBitmap(
+                    UserIcons.getDefaultUserIcon(UserHandle.USER_NULL, /* light= */ false)));
         }
-        return mGuestDrawable;
-    }
-
-    private Drawable getEncircledDefaultAvatar() {
-        if (mDefaultAvatarDrawable == null) {
-            mDefaultAvatarDrawable =
-                    encircle(createBitmapFromDrawable(R.drawable.ic_avatar_default_1));
-        }
-        return mDefaultAvatarDrawable;
+        return mDefaultIconDrawable;
     }
 
     private void setPhotoId(Preference pref, UserInfo user) {
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
index ac818a7..dda8d9e 100644
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java
@@ -433,6 +433,8 @@
      */
     private String getVisibilityStatus() {
         StringBuilder visibility = new StringBuilder();
+        StringBuilder scans24GHz = null;
+        StringBuilder scans5GHz = null;
 
         long now = System.currentTimeMillis();
 
@@ -441,7 +443,7 @@
             if (bssid != null) {
                 visibility.append(" ").append(bssid);
             }
-            visibility.append(" sc=").append(Integer.toString(mInfo.score));
+            visibility.append(" score=").append(mInfo.score);
             visibility.append(" ");
             visibility.append(String.format("tx=%.1f,", mInfo.txSuccessRate));
             visibility.append(String.format("%.1f,", mInfo.txRetriesRate));
@@ -455,63 +457,96 @@
             int num5 = 0;
             int num24 = 0;
             int numBlackListed = 0;
+            int n24 = 0; // Number scan results we included in the string
+            int n5 = 0; // Number scan results we included in the string
             Map<String, ScanResult> list = mScanResultCache.snapshot();
+            // TODO: sort list by RSSI or age
             for (ScanResult result : list.values()) {
                 if (result.seen == 0)
                     continue;
 
-                if (result.autoJoinStatus != ScanResult.ENABLED)
-                    numBlackListed++;
+                if (result.autoJoinStatus != ScanResult.ENABLED) numBlackListed++;
 
-                if (result.frequency > LOWER_FREQ_5GHZ
-                        && result.frequency < HIGHER_FREQ_5GHZ) {
-                    //strictly speaking: [4915, 5825]
-                    //number of known BSSID on 5GHz band
+                if (result.frequency >= LOWER_FREQ_5GHZ
+                        && result.frequency <= HIGHER_FREQ_5GHZ) {
+                    // Strictly speaking: [4915, 5825]
+                    // number of known BSSID on 5GHz band
                     num5 = num5 + 1;
-                } else if (result.frequency > LOWER_FREQ_24GHZ
-                        && result.frequency < HIGHER_FREQ_24GHZ) {
-                    //strictly speaking: [2412, 2482]
-                    //number of known BSSID on 2.4Ghz band
+                } else if (result.frequency >= LOWER_FREQ_24GHZ
+                        && result.frequency <= HIGHER_FREQ_24GHZ) {
+                    // Strictly speaking: [2412, 2482]
+                    // number of known BSSID on 2.4Ghz band
                     num24 = num24 + 1;
                 }
 
-                //ignore results seen, older than 20 seconds
+                // Ignore results seen, older than 20 seconds
                 if (now - result.seen > VISIBILITY_OUTDATED_AGE_IN_MILLI) continue;
 
-                if (result.frequency > LOWER_FREQ_5GHZ
-                        &&result.frequency < HIGHER_FREQ_5GHZ) {
+                if (result.frequency >= LOWER_FREQ_5GHZ
+                        && result.frequency <= HIGHER_FREQ_5GHZ) {
                     if (result.level > rssi5) {
                         rssi5 = result.level;
                     }
-                } else if (result.frequency > LOWER_FREQ_24GHZ
-                        && result.frequency < HIGHER_FREQ_24GHZ) {
+                    if (n5 < 4) {
+                        if (scans5GHz == null) scans5GHz = new StringBuilder();
+
+                        scans5GHz.append(" {").append(result.BSSID);
+                        scans5GHz.append("=").append(result.frequency);
+                        scans5GHz.append(",").append(result.level).append("}");
+                        n5++;
+                    }
+                } else if (result.frequency >= LOWER_FREQ_24GHZ
+                        && result.frequency <= HIGHER_FREQ_24GHZ) {
                     if (result.level > rssi24) {
                         rssi24 = result.level;
                     }
+                    if (n24 < 4) {
+                        if (scans24GHz == null) scans24GHz = new StringBuilder();
+                        scans24GHz.append(" {").append(result.BSSID);
+                        scans24GHz.append("=").append(result.frequency);
+                        scans24GHz.append(",").append(result.level).append("}");
+                        n24++;
+                    }
                 }
             }
             visibility.append(" [");
-            if (num24 > 0 || rssi24 > WifiConfiguration.INVALID_RSSI) {
-                visibility.append(Integer.toString(rssi24));
-                visibility.append(",");
-                visibility.append(Integer.toString(num24));
+            if (num24 > 0) {
+                visibility.append("(").append(num24).append(")");
+                if (n24 <= 4) {
+                    if (scans24GHz != null) {
+                        visibility.append(scans24GHz.toString());
+                    }
+                } else {
+                    visibility.append("max=").append(rssi24);
+                    if (scans24GHz != null) {
+                        visibility.append(",").append(scans24GHz.toString());
+                    }
+                }
             }
             visibility.append(";");
-            if (num5 > 0 || rssi5 > WifiConfiguration.INVALID_RSSI) {
-                visibility.append(Integer.toString(rssi5));
-                visibility.append(",");
-                visibility.append(Integer.toString(num5));
+            if (num5 > 0) {
+                visibility.append("(").append(num5).append(")");
+                if (n5 <= 4) {
+                    if (scans5GHz != null) {
+                        visibility.append(scans5GHz.toString());
+                    }
+                } else {
+                    visibility.append("max=").append(rssi5);
+                    if (scans5GHz != null) {
+                        visibility.append(",").append(scans5GHz.toString());
+                    }
+                }
             }
             if (numBlackListed > 0)
-                visibility.append("!");
+                visibility.append("!").append(numBlackListed);
             visibility.append("]");
         } else {
             if (mRssi != Integer.MAX_VALUE) {
-                visibility.append(", ss=");
-                visibility.append(Integer.toString(mRssi));
+                visibility.append(" rssi=");
+                visibility.append(mRssi);
                 if (mScanResult != null) {
-                    visibility.append(", ");
-                    visibility.append(Integer.toString(mScanResult.frequency));
+                    visibility.append(", f=");
+                    visibility.append(mScanResult.frequency);
                 }
             }
         }
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index dfb86cc..f86cc45 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -98,8 +98,7 @@
     public void onResume() {
         super.onResume();
         initPreferences();
-        getActivity().registerReceiver(mReceiver, mFilter,
-                android.Manifest.permission.CHANGE_NETWORK_STATE, null);
+        getActivity().registerReceiver(mReceiver, mFilter);
         refreshWifiInfo();
     }
 
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index 10c86dc..c24767b 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -27,10 +27,13 @@
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceScreen;
+
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
+
 import android.util.Log;
+import android.view.View;
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -166,7 +169,8 @@
                     mAccessPointSavedState = null;
                 }
                 mSelectedAccessPoint = mDlgAccessPoint;
-                mDialog = new WifiDialog(getActivity(), this, mDlgAccessPoint, false);
+                mDialog = new WifiDialog(getActivity(), this, mDlgAccessPoint,
+                        false /* not editting */, true /* hide the submit button */);
                 return mDialog;
 
         }
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 7168814..e6dd9c7 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -330,6 +330,13 @@
         return (level > -1 && level < mLevels.length) ? mLevels[level] : null;
     }
 
+    void hideSubmitButton() {
+        Button submit = mConfigUi.getSubmitButton();
+        if (submit == null) return;
+
+        submit.setVisibility(View.GONE);
+    }
+
     /* show submit button if password, ip and proxy settings are valid */
     void enableSubmitIfAppropriate() {
         Button submit = mConfigUi.getSubmitButton();
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index f1720c1..942c5dd 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -35,6 +35,13 @@
 
     private View mView;
     private WifiConfigController mController;
+    private boolean mHideSubmitButton;
+
+    public WifiDialog(Context context, DialogInterface.OnClickListener listener,
+            AccessPoint accessPoint, boolean edit, boolean hideSubmitButton) {
+        this(context, listener, accessPoint, edit);
+        mHideSubmitButton = hideSubmitButton;
+    }
 
     public WifiDialog(Context context, DialogInterface.OnClickListener listener,
             AccessPoint accessPoint, boolean edit) {
@@ -42,6 +49,7 @@
         mEdit = edit;
         mListener = listener;
         mAccessPoint = accessPoint;
+        mHideSubmitButton = false;
     }
 
     @Override
@@ -56,9 +64,14 @@
         setInverseBackgroundForced(true);
         mController = new WifiConfigController(this, mView, mAccessPoint, mEdit);
         super.onCreate(savedInstanceState);
-        /* During creation, the submit button can be unavailable to determine
-         * visibility. Right after creation, update button visibility */
-        mController.enableSubmitIfAppropriate();
+
+        if (mHideSubmitButton) {
+            mController.hideSubmitButton();
+        } else {
+            /* During creation, the submit button can be unavailable to determine
+             * visibility. Right after creation, update button visibility */
+            mController.enableSubmitIfAppropriate();
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index dc3974e..ffc10a0 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -27,8 +27,6 @@
 import android.os.Handler;
 import android.os.Message;
 import android.provider.Settings;
-import android.view.View;
-import android.widget.CompoundButton;
 import android.widget.Switch;
 import android.widget.Toast;
 
@@ -41,7 +39,6 @@
 
 public class WifiEnabler implements SwitchBar.OnSwitchChangeListener  {
     private Context mContext;
-    private Switch mSwitch;
     private SwitchBar mSwitchBar;
     private AtomicBoolean mConnected = new AtomicBoolean(false);
 
@@ -88,22 +85,20 @@
     public WifiEnabler(Context context, SwitchBar switchBar) {
         mContext = context;
         mSwitchBar = switchBar;
-        mSwitch = switchBar.getSwitch();
-        // This is a trick: as the Wi-Fi initial state is asynchronously coming from the
-        // BroadcastReceiver we cannot have the Switch visible at first otherwise you will notice
-        // its state change later on. So start it as VIEW.GONE and make it View.VISIBLE later
-        // when its state is defined.
-        mSwitch.setVisibility(View.GONE);
 
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+
         mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
         // The order matters! We really should not depend on this. :(
         mIntentFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);
         mIntentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+
         setupSwitchBar();
     }
 
     public void setupSwitchBar() {
+        final int state = mWifiManager.getWifiState();
+        handleWifiStateChanged(state);
         mSwitchBar.addOnSwitchChangeListener(this);
         mSwitchBar.show();
     }
@@ -126,27 +121,26 @@
     private void handleWifiStateChanged(int state) {
         switch (state) {
             case WifiManager.WIFI_STATE_ENABLING:
-                mSwitch.setEnabled(false);
+                mSwitchBar.setEnabled(false);
                 break;
             case WifiManager.WIFI_STATE_ENABLED:
-                setSwitchChecked(true);
-                mSwitch.setEnabled(true);
+                setSwitchBarChecked(true);
+                mSwitchBar.setEnabled(true);
                 updateSearchIndex(true);
                 break;
             case WifiManager.WIFI_STATE_DISABLING:
-                mSwitch.setEnabled(false);
+                mSwitchBar.setEnabled(false);
                 break;
             case WifiManager.WIFI_STATE_DISABLED:
-                setSwitchChecked(false);
-                mSwitch.setEnabled(true);
+                setSwitchBarChecked(false);
+                mSwitchBar.setEnabled(true);
                 updateSearchIndex(false);
                 break;
             default:
-                setSwitchChecked(false);
-                mSwitch.setEnabled(true);
+                setSwitchBarChecked(false);
+                mSwitchBar.setEnabled(true);
                 updateSearchIndex(false);
         }
-        mSwitch.setVisibility(View.VISIBLE);
     }
 
     private void updateSearchIndex(boolean isWiFiOn) {
@@ -158,12 +152,10 @@
         mHandler.sendMessage(msg);
     }
 
-    private void setSwitchChecked(boolean checked) {
-        if (checked != mSwitch.isChecked()) {
-            mStateMachineEvent = true;
-            mSwitch.setChecked(checked);
-            mStateMachineEvent = false;
-        }
+    private void setSwitchBarChecked(boolean checked) {
+        mStateMachineEvent = true;
+        mSwitchBar.setChecked(checked);
+        mStateMachineEvent = false;
     }
 
     private void handleStateChanged(@SuppressWarnings("unused") NetworkInfo.DetailedState state) {
@@ -192,7 +184,7 @@
         if (isChecked && !WirelessSettings.isRadioAllowed(mContext, Settings.Global.RADIO_WIFI)) {
             Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
             // Reset switch to off. No infinite check/listenenr loop.
-            switchView.setChecked(false);
+            mSwitchBar.setChecked(false);
             return;
         }
 
@@ -203,10 +195,9 @@
             mWifiManager.setWifiApEnabled(null, false);
         }
 
-        mSwitch.setEnabled(false);
         if (!mWifiManager.setWifiEnabled(isChecked)) {
             // Error
-            mSwitch.setEnabled(true);
+            mSwitchBar.setEnabled(true);
             Toast.makeText(mContext, R.string.wifi_error, Toast.LENGTH_SHORT).show();
         }
     }
diff --git a/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java b/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java
index e59c61c..2667e0b 100644
--- a/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java
+++ b/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java
@@ -125,7 +125,7 @@
         String passwordHex = byteArrayToHexString(password.getBytes());
 
         String passwordLength = password.length() >= HEX_RADIX
-                ? "" + Character.forDigit(password.length(), HEX_RADIX)
+                ? Integer.toString(password.length(), HEX_RADIX)
                 : "0" + Character.forDigit(password.length(), HEX_RADIX);
 
         passwordHex = String.format(PASSWORD_FORMAT, passwordLength, passwordHex).toUpperCase();