diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5b29c06..543a8a5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -351,6 +351,10 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".EnableWifiTether"
+            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:excludeFromRecents="true" />
+
         <activity android:name="Settings$TetherSettingsActivity"
                 android:label="@string/tether_settings_title_all"
                 android:taskAffinity="">
@@ -1109,6 +1113,9 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".SetupRedactionInterstitial"
+            android:theme="@style/SetupWizardDisableAppStartingTheme"/>
+
         <activity android:name=".notification.RedactionInterstitial"/>
 
         <activity android:name=".notification.RedactionSettingsStandalone"
@@ -1133,6 +1140,16 @@
             android:exported="false"
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
+        <activity android:name="SetupChooseLockGeneric"
+            android:taskAffinity="com.android.wizard"
+            android:theme="@style/SetupWizardDisableAppStartingTheme"
+            android:label="@string/lockpassword_choose_lock_generic_header">
+            <intent-filter>
+                <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="ChooseLockGeneric"
             android:label="@string/lockpassword_choose_lock_generic_header"
             android:excludeFromRecents="true" >
@@ -1149,11 +1166,23 @@
             android:excludeFromRecents="true"
         />
 
+        <activity android:name="SetupChooseLockPattern"
+            android:exported="false"
+            android:theme="@style/SetupWizardDisableAppStartingTheme" />
+
         <activity android:name="ChooseLockPattern" android:exported="false"/>
 
+        <activity android:name="SetupChooseLockPassword"
+            android:exported="false"
+            android:theme="@style/SetupWizardDisableAppStartingTheme"
+            android:windowSoftInputMode="stateVisible|adjustResize" />
+
         <activity android:name="ChooseLockPassword" android:exported="false"
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
+        <activity android:name=".SetupEncryptionInterstitial"
+            android:theme="@style/SetupWizardDisableAppStartingTheme"/>
+
         <activity android:name=".EncryptionInterstitial"/>
 
         <!-- Runs in the phone process since it needs access to the Phone object -->
@@ -2008,6 +2037,14 @@
                 android:resource="@id/sim_settings" />
         </activity>
 
+        <activity android:name=".sim.SimDialogActivity"
+                android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"
+                android:label="@string/sim_settings_title">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
         <provider
             android:name=".search.SettingsSearchIndexablesProvider"
             android:authorities="com.android.settings"
diff --git a/res/anim-ldrtl/slide_back_in.xml b/res/anim-ldrtl/slide_back_in.xml
new file mode 100644
index 0000000..e5ab3e5
--- /dev/null
+++ b/res/anim-ldrtl/slide_back_in.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="100%"
+    android:toXDelta="0%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim-ldrtl/slide_back_out.xml b/res/anim-ldrtl/slide_back_out.xml
new file mode 100644
index 0000000..8717f6a
--- /dev/null
+++ b/res/anim-ldrtl/slide_back_out.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="0%"
+    android:toXDelta="-100%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim-ldrtl/slide_next_in.xml b/res/anim-ldrtl/slide_next_in.xml
new file mode 100644
index 0000000..009ea9f
--- /dev/null
+++ b/res/anim-ldrtl/slide_next_in.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="-100%"
+    android:toXDelta="0%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim-ldrtl/slide_next_out.xml b/res/anim-ldrtl/slide_next_out.xml
new file mode 100644
index 0000000..b7ab2b6
--- /dev/null
+++ b/res/anim-ldrtl/slide_next_out.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="0%"
+    android:toXDelta="100%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim/slide_back_in.xml b/res/anim/slide_back_in.xml
new file mode 100644
index 0000000..009ea9f
--- /dev/null
+++ b/res/anim/slide_back_in.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="-100%"
+    android:toXDelta="0%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim/slide_back_out.xml b/res/anim/slide_back_out.xml
new file mode 100644
index 0000000..b7ab2b6
--- /dev/null
+++ b/res/anim/slide_back_out.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="0%"
+    android:toXDelta="100%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim/slide_next_in.xml b/res/anim/slide_next_in.xml
new file mode 100644
index 0000000..e5ab3e5
--- /dev/null
+++ b/res/anim/slide_next_in.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="100%"
+    android:toXDelta="0%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/anim/slide_next_out.xml b/res/anim/slide_next_out.xml
new file mode 100644
index 0000000..8717f6a
--- /dev/null
+++ b/res/anim/slide_next_out.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/setup_wizard_transition_duration"
+    android:fromXDelta="0%"
+    android:toXDelta="-100%"
+    android:interpolator="@android:anim/decelerate_interpolator"/>
diff --git a/res/drawable-hdpi/setup_illustration_lock_screen.jpg b/res/drawable-hdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..db697a0
--- /dev/null
+++ b/res/drawable-hdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-hdpi/setup_illustration_wifi.jpg b/res/drawable-hdpi/setup_illustration_wifi.jpg
new file mode 100644
index 0000000..d38551e
--- /dev/null
+++ b/res/drawable-hdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_lock_screen.jpg b/res/drawable-mdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..95e2b8c
--- /dev/null
+++ b/res/drawable-mdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_wifi.jpg b/res/drawable-mdpi/setup_illustration_wifi.jpg
new file mode 100644
index 0000000..a497bf5
--- /dev/null
+++ b/res/drawable-mdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..03cd9d9
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-hdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg
similarity index 100%
rename from res/drawable-hdpi/setup_illustration_wifi_wide_image.jpg
rename to res/drawable-sw600dp-hdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..4a7ab38
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-mdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg
similarity index 100%
rename from res/drawable-mdpi/setup_illustration_wifi_wide_image.jpg
rename to res/drawable-sw600dp-mdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..05f7725
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg
similarity index 100%
rename from res/drawable-xhdpi/setup_illustration_wifi_wide_image.jpg
rename to res/drawable-sw600dp-xhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..da3f7d9
--- /dev/null
+++ b/res/drawable-sw600dp-xxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg
similarity index 100%
rename from res/drawable-xxhdpi/setup_illustration_wifi_wide_image.jpg
rename to res/drawable-sw600dp-xxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..fd5da99
--- /dev/null
+++ b/res/drawable-sw600dp-xxxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_wifi_wide_image.jpg b/res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg
similarity index 100%
rename from res/drawable-xxxhdpi/setup_illustration_wifi_wide_image.jpg
rename to res/drawable-sw600dp-xxxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-sw600dp/setup_illustration.xml b/res/drawable-sw600dp/setup_illustration.xml
new file mode 100644
index 0000000..c0e54e2
--- /dev/null
+++ b/res/drawable-sw600dp/setup_illustration.xml
@@ -0,0 +1,33 @@
+<?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"
+    android:autoMirrored="true">
+
+    <item>
+        <bitmap android:src="@drawable/setup_illustration_horizontal_tile"
+            android:gravity="top"
+            android:tileModeX="repeat"
+            android:tileModeY="disabled" />
+    </item>
+
+    <item android:id="@+id/illustration_image">
+        <bitmap android:src="@drawable/setup_illustration_wifi"
+            android:gravity="top|start" />
+    </item>
+
+</layer-list>
diff --git a/res/drawable-xhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xhdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..b6b856e
--- /dev/null
+++ b/res/drawable-xhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xhdpi/setup_illustration_wifi.jpg b/res/drawable-xhdpi/setup_illustration_wifi.jpg
new file mode 100644
index 0000000..a399c19
--- /dev/null
+++ b/res/drawable-xhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..4cb0c63
--- /dev/null
+++ b/res/drawable-xxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-nodpi/setup_illustration_wifi_image.jpg b/res/drawable-xxhdpi/setup_illustration_wifi.jpg
similarity index 100%
rename from res/drawable-nodpi/setup_illustration_wifi_image.jpg
rename to res/drawable-xxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg b/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg
new file mode 100644
index 0000000..13821f3
--- /dev/null
+++ b/res/drawable-xxxhdpi/setup_illustration_lock_screen.jpg
Binary files differ
diff --git a/res/drawable-xxxhdpi/setup_illustration_wifi.jpg b/res/drawable-xxxhdpi/setup_illustration_wifi.jpg
new file mode 100644
index 0000000..56c19b6
--- /dev/null
+++ b/res/drawable-xxxhdpi/setup_illustration_wifi.jpg
Binary files differ
diff --git a/res/drawable/setup_illustration_wifi_wide.xml b/res/drawable/setup_illustration.xml
similarity index 71%
rename from res/drawable/setup_illustration_wifi_wide.xml
rename to res/drawable/setup_illustration.xml
index 33ee2f6..f8d96d5 100644
--- a/res/drawable/setup_illustration_wifi_wide.xml
+++ b/res/drawable/setup_illustration.xml
@@ -18,16 +18,9 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:autoMirrored="true">
 
-    <item>
-        <bitmap android:src="@drawable/setup_illustration_horizontal_tile"
-            android:gravity="top"
-            android:tileModeX="repeat"
-            android:tileModeY="disabled" />
-    </item>
-
     <item android:id="@+id/illustration_image">
-        <bitmap android:src="@drawable/setup_illustration_wifi_wide_image"
-            android:gravity="top|start" />
+        <bitmap android:src="@drawable/setup_illustration_wifi"
+            android:gravity="fill" />
     </item>
 
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/res/drawable/setup_illustration_wifi.xml b/res/drawable/setup_illustration_wifi.xml
deleted file mode 100644
index 9db2f13..0000000
--- a/res/drawable/setup_illustration_wifi.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true"
-    android:src="@drawable/setup_illustration_wifi_image" />
diff --git a/res/layout-land/setup_template.xml b/res/layout-land/setup_template.xml
new file mode 100644
index 0000000..cc3402f
--- /dev/null
+++ b/res/layout-land/setup_template.xml
@@ -0,0 +1,68 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="0dp">
+
+        <FrameLayout
+            android:id="@+id/title_area"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:background="@drawable/setup_illustration_bg"
+            android:elevation="@dimen/setup_wizard_title_area_elevation">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_setup_title"
+                style="@style/SetupTitle"/>
+        </FrameLayout>
+
+        <ScrollView
+            android:id="@+id/bottom_scroll_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/title_area"
+            android:layout_alignParentBottom="true"
+            android:fillViewport="true">
+
+            <FrameLayout android:id="@+id/setup_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipChildren="false"/>
+
+        </ScrollView>
+
+    </RelativeLayout>
+
+    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+        android:id="@+id/navigation_bar"
+        android:layout_width="match_parent"
+        android:layout_height="56dip"
+        style="@style/setup_wizard_navbar_style"/>
+</LinearLayout>
+
diff --git a/res/layout-sw600dp-land/setup_preference.xml b/res/layout-sw600dp-land/setup_preference.xml
index 431ac29..814bc91 100644
--- a/res/layout-sw600dp-land/setup_preference.xml
+++ b/res/layout-sw600dp-land/setup_preference.xml
@@ -22,10 +22,11 @@
     android:orientation="vertical">
 
     <com.android.settings.widget.SetupWizardIllustration
+        android:id="@+id/setup_illustration"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:foreground="@drawable/setup_illustration_wifi_wide"
+        android:foreground="@drawable/setup_illustration"
         android:background="@drawable/setup_illustration_bg">
 
         <LinearLayout
diff --git a/res/layout-sw600dp-land/setup_template.xml b/res/layout-sw600dp-land/setup_template.xml
new file mode 100644
index 0000000..a58dd3d
--- /dev/null
+++ b/res/layout-sw600dp-land/setup_template.xml
@@ -0,0 +1,74 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <com.android.settings.widget.SetupWizardIllustration
+        android:id="@+id/setup_illustration"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@drawable/setup_illustration_bg"
+        android:foreground="@drawable/setup_illustration">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="start|top"
+            android:weightSum="16">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/setup_wizard_tablet_illustration_height"
+                android:layout_weight="6"
+                android:text="@string/wifi_setup_title"
+                style="@style/SetupCardTitle"/>
+
+            <ScrollView
+                android:id="@+id/bottom_scroll_view"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginTop="@dimen/setup_wizard_card_land_margin_top"
+                android:layout_weight="8"
+                android:background="@drawable/setup_wizard_card_bg"
+                android:elevation="@dimen/setup_wizard_card_elevation"
+                android:fillViewport="true">
+
+                <FrameLayout android:id="@+id/setup_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:clipChildren="false"/>
+
+            </ScrollView>
+
+        </LinearLayout>
+
+    </com.android.settings.widget.SetupWizardIllustration>
+
+    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+        android:id="@+id/navigation_bar"
+        android:layout_width="match_parent"
+        android:layout_height="56dip"
+        style="@style/setup_wizard_navbar_style"/>
+
+</LinearLayout>
+
diff --git a/res/layout-sw600dp/setup_preference.xml b/res/layout-sw600dp/setup_preference.xml
index 1e772d9..ec6d2ac 100644
--- a/res/layout-sw600dp/setup_preference.xml
+++ b/res/layout-sw600dp/setup_preference.xml
@@ -21,12 +21,12 @@
     android:orientation="vertical">
 
     <com.android.settings.widget.SetupWizardIllustration
-        android:id="@+id/title_area"
+        android:id="@+id/setup_illustration"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:background="@drawable/setup_illustration_bg"
-        android:foreground="@drawable/setup_illustration_wifi_wide">
+        android:foreground="@drawable/setup_illustration">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/res/layout-sw600dp/setup_template.xml b/res/layout-sw600dp/setup_template.xml
new file mode 100644
index 0000000..297e9fb
--- /dev/null
+++ b/res/layout-sw600dp/setup_template.xml
@@ -0,0 +1,74 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <com.android.settings.widget.SetupWizardIllustration
+        android:id="@+id/setup_illustration"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@drawable/setup_illustration_bg"
+        android:foreground="@drawable/setup_illustration">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/setup_wizard_tablet_illustration_height"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/setup_wizard_card_port_margin_sides"
+            android:paddingEnd="@dimen/setup_wizard_card_port_margin_sides">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_setup_title"
+                style="@style/SetupCardTitle"/>
+
+            <ScrollView
+                android:id="@+id/bottom_scroll_view"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:background="@drawable/setup_wizard_card_bg"
+                android:elevation="@dimen/setup_wizard_card_elevation"
+                android:fillViewport="true">
+
+                <FrameLayout
+                    android:id="@+id/setup_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:clipChildren="false"/>
+
+            </ScrollView>
+
+        </LinearLayout>
+
+    </com.android.settings.widget.SetupWizardIllustration>
+
+    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+        android:id="@+id/navigation_bar"
+        android:layout_width="match_parent"
+        android:layout_height="56dip"
+        style="@style/setup_wizard_navbar_style"/>
+
+</LinearLayout>
+
diff --git a/res/layout/encryption_interstitial.xml b/res/layout/encryption_interstitial.xml
index 362ff82..162ad0e 100644
--- a/res/layout/encryption_interstitial.xml
+++ b/res/layout/encryption_interstitial.xml
@@ -20,8 +20,8 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingStart="@dimen/settings_side_margin"
-        android:paddingEnd="@dimen/settings_side_margin">
+        android:paddingStart="?attr/side_margin"
+        android:paddingEnd="?attr/side_margin">
 
     <TextView
             android:id="@+id/encryption_message"
diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index edcf5b8..c56db11 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -20,8 +20,8 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingStart="@dimen/settings_side_margin"
-        android:paddingEnd="@dimen/settings_side_margin">
+        android:paddingStart="?attr/side_margin"
+        android:paddingEnd="?attr/side_margin">
 
     <TextView
             android:layout_width="wrap_content"
diff --git a/res/layout/setup_choose_lock_password.xml b/res/layout/setup_choose_lock_password.xml
new file mode 100644
index 0000000..2f5e81c
--- /dev/null
+++ b/res/layout/setup_choose_lock_password.xml
@@ -0,0 +1,84 @@
+<?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="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <!-- header text ('Enter Pin') -->
+    <TextView android:id="@+id/headerText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:lines="2"
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+    <!-- Password entry field -->
+    <EditText android:id="@+id/password_entry"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginStart="30dip"
+        android:layout_marginEnd="30dip"
+        android:gravity="center"
+        android:inputType="textPassword"
+        android:imeOptions="actionNext"
+        android:textSize="24sp"
+        style="@style/TextAppearance.PasswordEntry"/>
+
+    <!-- Spacer between password entry and keyboard -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        style="@style/SecurityPreferenceButtonContainer">
+
+        <!-- left : cancel -->
+        <Button android:id="@+id/cancel_button"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/lockpassword_cancel_label"
+            style="@style/SecurityPreferenceButton"/>
+
+        <!-- right : continue -->
+        <Button android:id="@+id/next_button"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/lockpassword_continue_label"
+            style="@style/SecurityPreferenceButton"/>
+
+    </LinearLayout>
+
+    <!-- Alphanumeric keyboard -->
+    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#00000000"
+        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"/>
+
+</LinearLayout>
diff --git a/res/layout/setup_choose_lock_pattern.xml b/res/layout/setup_choose_lock_pattern.xml
new file mode 100644
index 0000000..a906826
--- /dev/null
+++ b/res/layout/setup_choose_lock_pattern.xml
@@ -0,0 +1,94 @@
+<?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.
+-->
+
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <!-- takes up all space above button bar at bottom -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView android:id="@+id/headerText"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:minHeight="50dp"
+            android:textSize="18sp"/>
+
+        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="4"
+            android:background="@color/lock_pattern_background"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+
+        <Button android:id="@+id/retryButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/lockpattern_retry_button_text"/>
+
+        <TextView android:id="@+id/footerText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minHeight="50dp"
+            android:textSize="14sp"/>
+
+    </LinearLayout>
+
+    <!-- Buttons are hidden during setup, and use the buttons in setup navigation bar instead -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        style="@style/SecurityPreferenceButtonContainer">
+
+        <!-- left : cancel, or re-try -->
+        <Button android:id="@+id/footerLeftButton"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/lockpattern_tutorial_cancel_label"
+            style="@style/SecurityPreferenceButton"/>
+
+        <!-- right : confirm or ok -->
+        <Button android:id="@+id/footerRightButton"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/lockpattern_tutorial_continue_label"
+            style="@style/SecurityPreferenceButton"/>
+
+    </LinearLayout>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout/setup_template.xml b/res/layout/setup_template.xml
new file mode 100644
index 0000000..0623e25
--- /dev/null
+++ b/res/layout/setup_template.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"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ScrollView
+        android:id="@+id/bottom_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipChildren="false">
+
+            <com.android.settings.widget.SetupWizardIllustration
+                android:id="@+id/setup_illustration"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:elevation="@dimen/setup_wizard_title_area_elevation"
+                android:background="@drawable/setup_illustration_bg"
+                android:foreground="@drawable/setup_illustration"
+                android:tag="stickyContainer"
+                settings:aspectRatio="2.22">
+
+                <TextView
+                    android:id="@+id/title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:tag="sticky"
+                    android:text="@string/wifi_setup_title"
+                    style="@style/SetupTitle"/>
+
+            </com.android.settings.widget.SetupWizardIllustration>
+
+            <FrameLayout
+                android:id="@+id/setup_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/setup_illustration"
+                android:clipChildren="false"/>
+
+        </RelativeLayout>
+
+    </ScrollView>
+
+    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+        android:id="@+id/navigation_bar"
+        android:layout_width="match_parent"
+        android:layout_height="56dip"
+        style="@style/setup_wizard_navbar_style"/>
+
+</LinearLayout>
+
diff --git a/res/layout/setup_wizard_header.xml b/res/layout/setup_wizard_header.xml
index c38a68d..b030ad1 100644
--- a/res/layout/setup_wizard_header.xml
+++ b/res/layout/setup_wizard_header.xml
@@ -18,12 +18,12 @@
 <com.android.settings.widget.SetupWizardIllustration
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:id="@+id/title_area"
+    android:id="@+id/setup_illustration"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/setup_illustration_bg"
     android:elevation="@dimen/setup_wizard_title_area_elevation"
-    android:foreground="@drawable/setup_illustration_wifi"
+    android:foreground="@drawable/setup_illustration"
     android:tag="stickyContainer"
     settings:aspectRatio="2.22">
 
diff --git a/res/layout/two_line_list_item.xml b/res/layout/two_line_list_item.xml
index e6a7c2b..0567bbc 100644
--- a/res/layout/two_line_list_item.xml
+++ b/res/layout/two_line_list_item.xml
@@ -18,8 +18,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingStart="16dip"
-    android:paddingEnd="16dip"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingTop="8dip"
     android:paddingBottom="8dip">
     <TextView
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index c055e51..66fda2d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ontkoppel?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dit sal jou verbinding met &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; beëindig."</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Jy het nie toestemming om Bluetooth-instellings te verander nie."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Naby toestelle kan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sien met Bluetooth-instellings oop."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Naby toestelle kan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sien met Bluetooth-instellings oop."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ontkoppel <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitsaai"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Dekativeer profiel?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Bestuur Wi-Fi, Bluetooth, vliegtuigmodus, sellulêre netwerke en VPN\'e"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Sellulêre data"</string>
     <string name="calls_title" msgid="3544471959217176768">"Oproepe"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS-boodskappe"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS-boodskappe"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Laat datagebruik oor selnetwerk toe"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Laat datagebruik met swerf toe"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataswerwing"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium tot hoë sekuriteit"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Wagwoord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Hoë sekuriteit"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Kenmerke vir toestelbeskerming sal nie meer werk nie."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Gedeaktiveer deur administrateur, enkripsiebeleid of eiebewysberging"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Swiep"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Verwyder ontsluitpatroon"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Verwyder ontsluit-PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Verwyder ontsluitwagwoord"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Verwyder skermslot"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Verander ontsluitpatroon"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Verander ontsluit-PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Verander ontsluitwagwoord"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Vir musiek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Onthou instellings"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi-assistent"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Gekoppel via Wi-Fi-assistent"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Uitsaaiskerm"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktiveer draadlose skermdeling"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Geen nabygeleë toestelle is gekry nie."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi-instellings"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Stel en beheer draadlose toegangspunte"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Kies Wi-Fi-netwerk"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Kies Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Skakel tans Wi-Fi aan…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Skakel tans Wi-Fi af…"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"WAARSKUWING: As jy Wi-Fi oorslaan, sal jou tablet net sellulêre data vir aanvanklike aflaaie en opdaterings gebruik. Koppel aan Wi-Fi om moontlike dataheffings te vermy."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"WAARSKUWING: As jy Wi-Fi oorslaan, sal jou toestel net sellulêre data vir aanvanklike aflaaie en opdaterings gebruik. Koppel aan Wi-Fi om moontlike dataheffings te vermy."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"WAARSKUWING: As jy Wi-Fi oorslaan, sal jou foon net sellulêre data vir aanvanklike aflaaie en opdaterings gebruik. Koppel aan Wi-Fi om moontlike dataheffings te vermy."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"As jy Wi‑Fi oorslaan:\n\nJou tablet sal nie \'n internetverbinding hê nie.\n\nJy sal nie sagtewareopdaterings kry voordat jy aan die internet koppel nie.\n\nJy kan nie op die oomblik kenmerke vir toestelbeskerming aktiveer nie."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"As jy Wi‑Fi oorslaan:\n\nJou toestel sal nie \'n internetverbinding hê nie.\n\nJy sal nie sagtewareopdaterings kry voordat jy aan die internet koppel nie.\n\nJy kan nie op die oomblik kenmerke vir toestelbeskerming aktiveer nie."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"As jy Wi‑Fi oorslaan:\n\nJou foon sal nie \'n internetverbinding hê nie.\n\nJy sal nie sagtewareopdaterings kry voordat jy aan die internet koppel nie.\n\nJy kan nie op die oomblik kenmerke vir toestelbeskerming aktiveer nie."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Die tablet kon nie aan hierdie Wi-Fi-netwerk koppel nie."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Die toestel kon nie aan hierdie Wi-Fi-netwerk koppel nie."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Die foon kon nie aan hierdie Wi-Fi-netwerk koppel nie."</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Steek asseblief SIM-kaart in en herbegin"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Koppel asseblief aan die internet"</string>
     <string name="location_title" msgid="1029961368397484576">"My ligging"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Werkprofiel"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ligging vir werkprofiel"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Deur jou maatskappy afgeskakel"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hoë akkuraatheid"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterybesparend"</string>
@@ -1440,16 +1436,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skerm sal nooit slaap terwyl laai nie"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktiveer Bluetooth HCI-loerloglêer"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Vang alle Bluetooth HCI-pakette in \'n lêer vas"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-ontsluit"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Laat toe dat die selflaaiprogram ontsluit word"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Voer jou PIN in"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Voer jou PIN in om OEM-ontsluit te aktiveer"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Laat OEM-ontsluit toe?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WAARSKUWING: Toestelbeskermingkenmerke sal nie op hierdie toestel werk terwyl hierdie instelling aangeskakel is nie."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Draadlose skermsertifisering"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktiveer Wi-Fi-woordryke aanmelding"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiewe Wi-Fi na selfoon-oordrag"</string>
@@ -1856,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Sluit programdata in"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Outomatiese teruglaai"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Wanneer \'n program weer geïnstalleer word, herstel gerugsteunde instellings en data"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Rugsteundiens in onaktief."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Dit word deur jou toestelbeleid gestel."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Werkskerm-rugsteunwagwoord"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Volle rekenaarrugsteune word nie tans beskerm nie"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Raak om die wagwoord vir volledige rekenaarrugsteune te verander of te verwyder"</string>
@@ -2011,10 +2001,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Gebruik altyd GPU vir skermsamestelling"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simuleer kleurruimte"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktiveer OpenGL-spore"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Gebruik AwesomePlayer (opgeskort)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"AwesomePlayer i.p.v. NuPlayer vir mediaterugspeel"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Deaktiveer USB-oudioroetering"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Deaktiveer outoroetering na USB-oudiorandtoestelle"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Wys uitleg se grense"</string>
@@ -2325,8 +2313,7 @@
     <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 leeg"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM-naam"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Voer SIM-naam in"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-gleuf %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Diensverskaffer"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nommer"</string>
@@ -2336,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Pers"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Geen SIM-kaarte ingevoeg nie"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM-status"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM se verwante inligting"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Bel terug van verstek-SIM af"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM vir uitgaande oproepe"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Ander oproepinstellings"</string>
@@ -2480,8 +2466,8 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Begintyd"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Eindigtyd"</string>
     <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> volgende dag"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> of enige wekker daarvoor"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> volgende dag of enige wekker daarvoor"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> of enige wekker voor dit"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> volgende dag of enige wekker voor dit"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programkennisgewings"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Kennisgewingsinstellings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Stuur terugvoer oor hierdie toestel"</string>
@@ -2502,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-inligting"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI se relatiewe inligting"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Enkripsie"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Gaan voort"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Jy kan hierdie toestel verder beskerm deur jou PIN te vereis voordat dit begin. Die toestel kan eers oproepe, boodskappe en kennisgewings, insluitend wekkers, ontvang nadat dit begin het. \n\nDit help om data op verlore of gesteelde toestelle te beskerm."</string>
diff --git a/res/values-am-nokeys/strings.xml b/res/values-am-nokeys/strings.xml
index 26b226d..27cbc54 100644
--- a/res/values-am-nokeys/strings.xml
+++ b/res/values-am-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"ትግበራዎች አዸራጅ"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"መተግበሪያዎች አዸራጅ"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d24ef7e..d8e3902 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ይለያይ?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&amp;gt ጋርያልዎትን ተያያዥ ያበቃል።"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"የብሉቱዝ ቅንብሮችን ለመለወጥ ፈቃድ የልዎትም።"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> የብሉቱዝ ቅንብሮች ክፍት ሆኖ ሳለ አቅራቢያ ላሉ መሣሪያዎች ይታያል።"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> የብሉቱዝ ቅንብሮች ክፍት ሆኖ ሳለ አቅራቢያ ላሉ መሣሪያዎች ይታያል።"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"የ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ግንኙነት ይቋረጥ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ማሰራጨት"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"መገለጫ ይቦዝን?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi፣ ብሉቱዝ፣ የአውሮፕላን ሁነታ፣ የተንቀሳቃሽ ስልክ አውታረ መረቦችን እና VPNዎችን ያቀናብሩ"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"የተንቀሳቃሽ ስልክ ውሂብ"</string>
     <string name="calls_title" msgid="3544471959217176768">"ጥሪዎች"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"የኤስኤምኤስ መልዕክቶች"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"የኤስኤምኤስ መልዕክቶች"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"በስልክ አውታረ መረብ ላይ ውሂብ መጠቀም ፍቀድ"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"በሌላ የስልክ አውታረ መረብ መንቀሳቀስ ላይ ሳሉ የውሂብ መጠቀም ይፈቀድ"</string>
     <string name="roaming" msgid="3596055926335478572">"ውሂብ በእንቅስቃሴ ላይ"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ከመካከለኛ እስከ ከፍተኛ ጥበቃ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">" የይለፍ ቃል፡"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ከፍተኛ ጥበቃ"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"የመሣሪያ ጥበቃ ባህሪዎች ከእንግዲህ አይሰሩም።"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"የምስጠራ መምሪያ ወይም ማስረጃ ማከማቻ በአስተዳዳሪ ቦዝኗል"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ምንም"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ማንሸራተት"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"የመክፈቻ ስርዓተ ጥለት አስወግድ"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"መክፈቻ ፒን  አስወግድ"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"የመክፈቻ ይለፍ ቃል አስወግድ"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"ማያ ገጽ ቆላፊን አስወግድ"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"መክፈቻ ስርዓት ጥለት ለውጥ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"መክፈቻ ፒን  ለውጥ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"መክፈቻ ይለፍ ቃል ለውጥ"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ለሙዚቃ እና ማህደረ መረጃ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ቅንብሮች አስታውስ"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi ረዳት"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"በWi‑Fi ረዳት አማካኝነት ተገናኝቷል"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"ማያ ገጽ ውሰድ"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ገመድ-አልባ ማሳየትን ያንቁ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"በአቅራቢያ ምንም መሳሪያዎች አልተገኙም።"</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"የWi-Fi ቅንብሮች"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"አዘጋጅ&amp; የገመድ አልባ ድረስ ነጥብ አደራጅ"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"የWi‑Fi አውታረ መረብ ይምረጡ"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi ይምረጡ"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi በማብራት ላይ..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi በማጥፋት ላይ..."</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ማስጠንቀቂያ፦ Wi‑Fiን ከዘለሉ ጡባዊዎ ለተጀመሩ ውርዶች እና ዝማኔዎች የተንቀሳቃሽ ስልክ ውሂብ ብቻ ነው የሚጠቀመው። ሊከሰቱ የሚችሉ የውሂብ ክፍያዎችን ለማቀብ ከWi‑Fi ጋር ይገናኙ።"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ማስጠንቀቂያ፦ Wi‑Fiን ከዘለሉ መሣሪያዎ ለተጀመሩ ውርዶች እና ዝማኔዎች የተንቀሳቃሽ ስልክ ውሂብ ብቻ ነው የሚጠቀመው። ሊከሰቱ የሚችሉ የውሂብ ክፍያዎችን ለማቀብ ከWi‑Fi ጋር ይገናኙ።"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ማስጠንቀቂያ፦ Wi‑Fiን ከዘለሉ ስልክዎ ለተጀመሩ ውርዶች እና ዝማኔዎች የተንቀሳቃሽ ስልክ ውሂብ ብቻ ነው የሚጠቀመው። ሊከሰቱ የሚችሉ የውሂብ ክፍያዎችን ለማቀብ ከWi‑Fi ጋር ይገናኙ።"</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Wi‑Fiን ከዘለሉ፦\n\nየእርስዎ ጡባዊ የበይነመረብ ግንኙነት አይኖረውም።\n\nከበይነመረብ ጋር እስከሚያገናኙት ድረስ የሶፍትዌር ዝማኔዎችን አያገኙም።\n\nበዚህ ጊዜ ላይ የመሣሪያ ጥበቃ ባህሪያትን ማግበር አይችሉም።"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Wi‑Fiን ከዘለሉ፦\n\nየእርስዎ መሣሪያ የበይነመረብ ግንኙነት አይኖረውም።\n\nከበይነመረብ ጋር እስከሚያገናኙት ድረስ የሶፍትዌር ዝማኔዎችን አያገኙም።\n\nበዚህ ጊዜ ላይ የመሣሪያ ጥበቃ ባህሪያትን ማግበር አይችሉም።"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Wi‑Fiን ከዘለሉ፦\n\nየእርስዎ ስልክ የበይነመረብ ግንኙነት አይኖረውም።\n\nከበይነመረብ ጋር እስከሚያገናኙት ድረስ የሶፍትዌር ዝማኔዎችን አያገኙም።\n\nበዚህ ጊዜ ላይ የመሣሪያ ጥበቃ ባህሪያትን ማግበር አይችሉም።"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ጡባዊው ከዚህ የWi-Fi አውታረ መረብ ጋር መገናኘት አልቻለም።"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"መሣሪያው ከዚህ የWi‑Fi አውታረ መረብ ጋር ሊገናኝ አልቻለም።"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ስልኩ ከዚህ የWi-Fi አውታረ መረብ ጋር መገናኘት አልቻለም።"</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"እባክዎ SIM ካርድ ያስገቡና ዳግም ያስጀምሩ"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"እባክዎ ከበይነ መረብ ጋር ያገናኙ"</string>
     <string name="location_title" msgid="1029961368397484576">"የእኔ  ሥፍራ"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"የስራ መገለጫ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"የስራ መገለጫ አካባቢ"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"በኩባንያዎ በኩል ጠፍቷል"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"ሁነታ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ከፍተኛ ትክክለኝነት"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"የባትሪ ኃይል ቁጠባ"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"የመተግበሪያ ውሂብ አካትት"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ራስ ሰር ነበረበት መልስ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"መተግበሪያን ዳግም ስትጭን ምትኬ ቅንብሮች  እና ውሂብ እነበሩበት መልስ"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"የምትኬ አገልግሎት ቦዝኗል።"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ይህ በእርስዎ መሣሪያ መመሪያ የተዘጋጀ ነው።"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"የዴስክቶፕ መጠባበቂያ ይለፍ ቃል"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ዴስክቶፕ ሙሉ ምትኬዎች በአሁኑ ሰዓት አልተጠበቁም"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ለዴስክቶፕ ሙሉ ምትኬዎች የይለፍ ቃል ለመለወጥ ወይም ለማስወገድ ንካ"</string>
@@ -2319,8 +2313,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"የሲም ስም ያስገቡ"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"የሲም ማስገቢያ %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"አገልግሎት አቅራቢ"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"ቁጥር"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"ወይን ጠጅ"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"ምንም ሲም ካርዶች አልገቡም"</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">"ከነባሪ ሲም መልሰው ይደውሉ"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"የወጪ ጥሪዎች ሲም"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"ሌሎች የጥሪ ቅንብሮች"</string>
@@ -2496,7 +2488,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"በወርድ እይታ ላይ ቆይ"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"በአሁኑ አቀማመጠ-ገጽ ላይ ቆይ"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"የIMEI መረጃ"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"የIMEI ተዛማጅ መረጃ"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"ማመስጠር"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ቀጥል"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ይህን መሣሪያ ከመጀመሩ በፊት የእርስዎን ፒን እንዲጠይቅ በማድረግ ይበልጥ ጥበቃ ሊያደርጉለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ፣ ማንቂያዎችን ጨምሮ ጥሪዎችን፣ መልዕክቶችን ወይም ማሳወቂያዎችን መቀበል አይችልም። \n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6dce171..5e25cfe 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"هل تريد قطع الاتصال؟"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏سيؤدي هذا إلى إنهاء الاتصال مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"ليست لديك أذونات لتغيير إعدادات بلوتوث."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> مرئي للأجهزة القريبة أثناء فتح إعدادات البلوتوث."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> مرئي للأجهزة القريبة أثناء فتح إعدادات البلوتوث."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"هل تريد فصل <xliff:g id="DEVICE_NAME">%1$s</xliff:g>؟"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"البث"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"تعطيل الملف الشخصي؟"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"‏إدارة اتصال Wi‑Fi والبلوتوث ووضع الطائرة وشبكات الجوّال والشبكات الظاهرية الخاصة"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"بيانات شبكة الجوّال"</string>
     <string name="calls_title" msgid="3544471959217176768">"المكالمات"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"‏الرسائل القصيرة SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"‏الرسائل القصيرة SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"السماح باستخدام بيانات شبكة الجوّال"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"السماح باستخدام بيانات التجوال"</string>
     <string name="roaming" msgid="3596055926335478572">"تجوال البيانات"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"من تأمين متوسط إلى عال"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"كلمة المرور"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"تأمين عال"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"لن تعمل ميزات حماية الجهاز بعد الآن."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"تم تعطيله من جانب المشرف أو بسبب سياسة التشفير أو وحدة تخزين بيانات الاعتماد"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"لا شيء"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"مرر سريعًا"</string>
@@ -410,6 +411,7 @@
     <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_password_summary" msgid="192161194564577025">"إزالة كلمة مرور إلغاء التأمين"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"إزالة قفل الشاشة"</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_password_title" msgid="5606298470358768865">"تغيير كلمة مرور إلغاء التأمين"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"للموسيقى والوسائط"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"تذكّر الإعدادات"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"‏مساعد Wi‑Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"‏تم التوصيل عبر مساعد Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"بث الشاشة"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"تمكين عرض شاشة لاسلكي"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"لم يتم العثور على أجهزة بالجوار."</string>
@@ -2320,7 +2323,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"إعدادات المكالمات الأخرى"</string>
@@ -2486,7 +2488,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"الاحتفاظ بالعرض الأفقي"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"الاحتفاظ بالاتجاه الحالي"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"‏معلومات IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"‏المعلومات ذات الصلة بـ IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"التشفير"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"متابعة"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"يمكنك إضافة المزيد من الحماية إلى هذا الجهاز عن طريق اشتراط إدخال رقم التعريف الشخصي قبل بدء تشغيله. وإلى أن يتم بدء تشغيل الجهاز، لا يمكن للجهاز استقبال مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات. \n\nويساعد هذا في حماية البيانات على الأجهزة  المفقودة أو المسروقة."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 27c8354..cc0018e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Да се изключи ли?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Това ще прекрати връзката ви със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Нямате разрешение да променяте настройките за Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"При отворени настр. за Bluetooth у-вата в района ще виждат „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Да се прекрати ли връзката с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Излъчване"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Да се деактивира ли потребит. профил?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Управление на Wi‑Fi, Bluetooth, самолетен режим, клетъчни и виртуални частни мрежи (VPN)"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Мобилни данни"</string>
     <string name="calls_title" msgid="3544471959217176768">"Обаждания"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS съобщения"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Пренос на данни през клетъчната мрежа"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Пренос на данни при роуминг"</string>
     <string name="roaming" msgid="3596055926335478572">"Роуминг на данни"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Деакт. от админ., правила за шифроване или хранил. за идент. данни"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Няма"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Прекарване на пръст"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"Премахване на парола за отключване"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"Промяна на паролата за отключване"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"За музика и медийни файлове"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомняне на настройки"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Асистент за Wi‑Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Установена е връзка чрез помощника за Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Екран за предаване"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Активиране на безжичния дисплей"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Няма намерени устройства в района."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Настройки за Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Задаване и управление на безжични точки за достъп"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Избиране на Wi‑Fi мрежа"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Избиране на Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi се включва…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi се изключва…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Сканирането е винаги налице"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Сканирането да е разрешено винаги"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Разрешете на услугата на Google за местоположения и другите приложения да сканират за мрежи дори когато Wi-Fi е изключен"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Автом. ползване на отворени Wi‑Fi мрежи"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Помощникът за Wi‑Fi автоматично да се свързва с отворени мрежи, които определи за надеждни"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Избиране на помощник"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Инсталиране на сертификати"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"За подобряване на точността на местоположението и за други цели Google и останалите приложения може да сканират за мрежи в района дори когато Wi-Fi е изключен. Ако не искате това да се случва, отворете „Разширени“ &gt; „Сканирането винаги да е налице“."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Приложенията може да сканират за мрежи в района дори когато Wi-Fi е изключен. Ако не искате това да се случва, отворете „Разширени“ &gt; „Сканирането винаги да е налице“."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ПРЕДУПРЕЖДЕНИЕ: Ако пропуснете Wi‑Fi, таблетът ви ще използва само мобилни данни за първоначалните изтегляния и актуализации. За да избегнете евентуално таксуване, установете връзка с Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ПРЕДУПРЕЖДЕНИЕ: Ако пропуснете Wi‑Fi, устройството ви ще използва само мобилни данни за първоначалните изтегляния и актуализации. За да избегнете евентуално таксуване, установете връзка с Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ПРЕДУПРЕЖДЕНИЕ: Ако пропуснете Wi‑Fi, телефонът ви ще използва само мобилни данни за първоначалните изтегляния и актуализации. За да избегнете евентуално таксуване, установете връзка с Wi‑Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ако не използвате Wi‑Fi:\n\nТаблетът ви няма да има връзка с интернет.\n\nНяма да получавате софтуерни актуализации, докато не се свържете с интернет.\n\nПонастоящем не можете да активирате функциите за защита на устройството."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ако не използвате Wi‑Fi:\n\nУстройството ви няма да има връзка с интернет.\n\nНяма да получавате софтуерни актуализации, докато не се свържете с интернет.\n\nПонастоящем не можете да активирате функциите за защита на устройството."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ако не използвате Wi‑Fi:\n\nТелефонът ви няма да има връзка с интернет.\n\nНяма да получавате софтуерни актуализации, докато не се свържете с интернет.\n\nПонастоящем не можете да активирате функциите за защита на устройството."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Таблетът не можа да се свърже с тази Wi‑Fi мрежа."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Устройството не можа да се свърже с тази Wi‑Fi мрежа."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефонът не можа да се свърже с тази Wi‑Fi мрежа."</string>
@@ -836,8 +836,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яркост"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Събуждане при повдигане"</string>
     <string name="doze_title" msgid="2259176504273878294">"Дисплей, открояващ важни неща"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Включване на екрана при вдигане на устройството или при получаване на известия"</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>
@@ -1017,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Понастоящем сте влезли в следните профили:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На това устройство има други потребители.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Снимки"</li>\n<li>"Други потребителски данни"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"USB хранилището"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"SD картата"</b>"."</string>
@@ -1092,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Моля, поставете SIM карта и рестартирайте"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Моля, свържете се с интернет"</string>
     <string name="location_title" msgid="1029961368397484576">"Моето местоположение"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Служебен потр. профил"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Местоп. за служ. потр. профил"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Изключено от фирмата ви"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Висока точност"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Запазване на батерията"</string>
@@ -1445,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екранът никога няма да е в спящ режим при зареждане"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Активиране на регистрационния файл за анализ на пакетите в команден ред за Bluetooth с протокола HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Заснемане на всички пакети за Bluetooth с протокола HCI във файла"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Отключване от OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Разрешаване на първонач. зареждащата прогр. да се откл."</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Въведете ПИН кода си"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Въведете ПИН кода за устройството си, за да активирате OEM отключването"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Да се разреши ли отключване от OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ПРЕДУПРЕЖДЕНИЕ: Функциите за защита на устройството няма да работят на това, докато следната настройка е включена."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертифициране на безжичния дисплей"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"„Многословно“ регистр. на Wi‑Fi: Актив."</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi към моб. мрежи: Агресивно предав."</string>
@@ -1861,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Включв. на данните от прилож."</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автоматично възстановяване"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"При повторно инсталиране на приложение да се възстановят настройките и данните от резервното копие"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Услугата за създ. на резервно копие не е активна."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Това е зададено от правилата на устройството ви."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Наст. комп.: Парола"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Понастоящем пълните резервни копия за настолен компютър не са защитени"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Докоснете, за да промените или премахнете паролата за пълни резервни копия на настолния компютър"</string>
@@ -2016,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Винаги да се използва GPU за изграждане на екрана"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Цвет. простр.: Симулиране"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Трасирания на OpenGL: Акт."</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Ползв. на AwesomePlayer (оттегл.)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Ползв. на AwesomePlayer вместо NuPlayer за въпроизв. на повечето мултимедии"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Маршрут. на аудио чрез USB: Деакт."</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Авт. маршрут. за периферните у-ва за аудио чрез USB: Деакт."</string>
     <string name="debug_layout" msgid="5981361776594526155">"Граници на оформлението"</string>
@@ -2330,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Въведете името на SIM картата"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Слот за SIM карта: %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Номер"</string>
@@ -2341,7 +2327,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"Други настройки за обаждане"</string>
@@ -2484,12 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Делничните вечери"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Начален час"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Краен час"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> на следващия ден"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> или при всеки будилник преди това"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> на следващия ден или при всеки будилник преди това"</string>
     <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>
@@ -2510,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Оставане в хоризонтален изглед"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Оставане в текущата ориентация"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Информация за IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Информация относно IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифроване"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Напред"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Можете да осигурите допълнителен защитен слой за това устройство, като зададете ПИН кодът ви да се изисква при стартиране. Преди въвеждането му няма да могат да се получават обаждания, съобщения или известия. Будилниците също няма да работят. \n\nФункцията помага за защита на данните на загубени или откраднати устройства."</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index b7dee2f..13b353c 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"সংযোগ বিচ্ছিন্ন করবেন?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"এটি আপনার সঙ্গে:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;\'র সংযোগ বিচ্ছিন্ন করবে"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"আপনার কাছে Bluetooth সেটিংস পরিবর্তন করার অনুমতি নেই৷"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Bluetooth সেটিংস খোলা থাকা অবস্থায় <xliff:g id="DEVICE_NAME">%1$s</xliff:g> কাছাকাছি ডিভাইসগুলির কাছে দৃশ্যমান।"</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সংযোগ বিচ্ছিন্ন করবেন?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"সম্প্রচার করা হচ্ছে"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"প্রোফাইল অক্ষম করবেন?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, Bluetooth, বিমান মোড, সেলুলার নেটওয়ার্ক ও VPN-গুলি পরিচালনা করুন"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"সেলুলার ডেটা"</string>
     <string name="calls_title" msgid="3544471959217176768">"কলগুলি"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS বার্তাগুলি"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"সেলুলার নেটওয়ার্কের মাধ্যমে ডাটা ব্যবহারের অনুমতি দিন"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"রোমিংয়ের সময় ডাটা ব্যবহারের অনুমতি দিন"</string>
     <string name="roaming" msgid="3596055926335478572">"ডেটা রোমিং"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"প্রশাসক, এনক্রিপশান নীতি, অথবা শংসাপত্র সঞ্চয়স্থান দ্বারা অক্ষম"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"কোনো কিছুই নয়"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"সোয়াইপ করুন"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"আনলক পাসওয়ার্ড সরান"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"আনলক পাসওয়ার্ড পরিবর্তন করুন"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"সঙ্গীত এবং মিডিয়ার জন্য"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"সেটিংস মনে রাখুন"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi সহকারী"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi সহায়ক-এর মাধ্যমে সংযুক্ত হয়েছে"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"স্ক্রীণ কাস্ট করুন"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ওয়্যারলেস প্রদর্শন সক্ষম করুন"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"কাছাকাছি কোনো ডিভাইস পাওয়া যায়নি।"</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi সেটিংস"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ওয়্যারলেস অ্যাক্সেস পয়েন্ট সেট আপ ও পরিচালনা করুন"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi নেটওয়ার্ক নির্বাচন করুন"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi নির্বাচন করুন"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi চালু করা হচ্ছে..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi বন্ধ করা হচ্ছে..."</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"সতর্কবার্তা: আপনি যদি Wi‑Fi এড়িয়ে যান তাহলে আপনার টাবলেট প্রারম্ভিক ডাউনলোড ও আপডেটগুলির জন্য শুধুমাত্র সেলুলার ডেটা ব্যবহার করবে। ডেটা ব্যবহারের সম্ভাব্য চার্জ এড়ানোর জন্য, Wi‑Fi এর সাথে সংযুক্ত হোন।"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"সতর্কবার্তা: আপনি যদি Wi‑Fi এড়িয়ে যান তাহলে আপনার ডিভাইস প্রারম্ভিক ডাউনলোড ও আপডেটগুলির জন্য শুধুমাত্র সেলুলার ডেটা ব্যবহার করবে। ডেটা ব্যবহারের সম্ভাব্য চার্জ এড়ানোর জন্য, Wi‑Fi এর সাথে সংযুক্ত হোন।"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"সতর্কবার্তা: আপনি যদি Wi‑Fi এড়িয়ে যান তাহলে আপনার ফোন প্রারম্ভিক ডাউনলোড ও আপডেটগুলির জন্য শুধুমাত্র সেলুলার ডেটা ব্যবহার করবে। ডেটা ব্যবহারের সম্ভাব্য চার্জ এড়ানোর জন্য, Wi‑Fi এর সাথে সংযুক্ত হোন।"</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"যদি আপনি Wi‑Fi এড়িয়ে যান:\n\nআপনার ট্যাবলেটে কোনো ইন্টারনেট সংযোগ থাকবে না৷\n\nআপনি ইন্টারনেটে সংযোগ না করা পর্যন্ত সফ্টওয়্যার আপডেটগুলি পাবেন না৷\n\nএই সময়ে আপনি ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করতে পারবেন না৷"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"যদি আপনি Wi‑Fi এড়িয়ে যান:\n\nআপনার ডিভাইসে কোনো ইন্টারনেট সংযোগ থাকবে না৷\n\nআপনি ইন্টারনেটে সংযোগ না করা পর্যন্ত সফ্টওয়্যার আপডেটগুলি পাবেন না৷\n\nএই সময়ে আপনি ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করতে পারবেন না৷"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"যদি আপনি Wi‑Fi এড়িয়ে যান:\n\nআপনার ফোনে কোনো ইন্টারনেট সংযোগ থাকবে না৷\n\nআপনি ইন্টারনেটে সংযোগ না করা পর্যন্ত সফ্টওয়্যার আপডেটগুলি পাবেন না৷\n\nএই সময়ে আপনি ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করতে পারবেন না৷"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ট্যাবলেট এই Wi‑Fi নেটওয়ার্কের সাথে সংযোগ স্থাপন করতে অক্ষম।"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"ডিভাইসটি এই Wi‑Fi নেটওয়ার্কের সাথে সংযুক্ত হতে অক্ষম হয়েছে।"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ফোন এই Wi‑Fi নেটওয়ার্কের সাথে সংযোগ স্থাপন করতে অক্ষম।"</string>
@@ -1087,12 +1090,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"কাজের প্রোফাইল"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"কাজের প্রোফাইলের জন্য অবস্থান"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"আপনার কোম্পানী বন্ধ করেছে"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"মোড"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"উচ্চ পর্যায়ের যথার্থতা"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ব্যাটারি সঞ্চয়"</string>
@@ -1440,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"চার্জ হওয়ার স্ক্রীন কখনই নিদ্রা মোডে যাবে না"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI স্নুপ লগ সক্ষম করুন"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"একটি ফাইলে সব bluetooth HCI প্যাকেট ক্যাপচার করুন"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM আনলক করা হচ্ছে"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"বুট-লোডার আনলক করার অনুমতি দিন"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"আপনার PIN লিখুন"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM আনলক সক্ষম করতে ডিভাইস PIN লিখুন"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM আনলক করার অনুমতি দিতে চান?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"সতর্কতা: এই ডিভাইসে সেটিংটি চালু থাকা অবস্থায় ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি কাজ করবে না৷"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ওয়্যারলেস ডিসপ্লে সার্টিফিকেশন"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi ভারবোস লগিং সক্ষম করুন"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi থেকে সেলুলারে তৎপর পরিবর্তন"</string>
@@ -1856,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"অ্যাপ্লিকেশান ডেটা অন্তর্ভুক্ত করুন"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"স্বয়ংক্রিয়ভাবে পুনঃস্থাপন করুন"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"অ্যাপ্লিকেশান পুনরায় ইনস্টল করার সময়, ব্যাক আপ সেটিংস এবং ডেটা পুনরুদ্ধার করুন"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"ব্যাকআপ পরিষেবা নিষ্ক্রিয় রয়েছে৷"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"এটি আপনার ডিভাইস নীতির অনুসারে সেট করা হয়৷"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ডেস্কটপ ব্যাকআপ পাসওয়ার্ড"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ডেস্কটপ পূর্ণ ব্যাকআপ বর্তমানে সুরক্ষিত নয়"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ডেস্কটপ পুরো ব্যাকআপের জন্য পাসওয়ার্ড পরিবর্তন বা মুছে ফেলার জন্য স্পর্শ করুন"</string>
@@ -2011,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"সর্বদা স্ক্রীন কম্পোসিটিংয়ের জন্য GPU ব্যবহার করুন"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"রঙ স্থান নকল করুন"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL ট্রেসগুলি সক্ষম করুন"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer ব্যবহার করুন (অসমর্থিত হয়েছে)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"অধিকাংশ মিডিয়া প্লেব্যাক করার জন্য NuPlayer এর পরিবর্তে AwesomePlayer ব্যবহার করুন"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB অডিও রাউটিং অক্ষম করুন"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB অডিও যন্ত্রানুষঙ্গে স্বয়ংক্রিয় রাউটিং অক্ষম করুন"</string>
     <string name="debug_layout" msgid="5981361776594526155">"লেআউট সীমাগুলি দেখান"</string>
@@ -2325,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM নাম লিখুন"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM স্লট %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"পরিষেবা প্রদানকারী"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"সংখ্যা"</string>
@@ -2336,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"বেগুনি"</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>
@@ -2500,7 +2490,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ভূদৃশ্য দৃশ্যে থাকুন"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"বর্তমান সজ্জায় থাকুন"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI তথ্য"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI আপেক্ষিক তথ্য"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"এনক্রিপশান"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"অবিরত থাকুন"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"আপনি এই ডিভাইসটিকে, সেটি শুরুর আগে আপনার PIN চাইবে, এমন পদ্ধতির মাধ্যমে আরো সুরক্ষিত করতে পারেন। ডিভাইস শুরু না হওয়া পর্যন্ত, এটি অ্যালার্ম সহ কল, বার্তা, বিজ্ঞপ্তি প্রাপ্ত করতে পারবেন না। \n\nআপনার ডিভাইস হারিয়ে বা চুরি হয়ে গেলে ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে।"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d81ea3b..ae03e8a 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vols desconnectar-te?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Això posarà fi a la teva connexió amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"No tens permís per canviar la configuració del Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> serà visible per a dispositius propers amb la configuració de Bluetooth activada."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> serà visible per a dispositius propers amb la configuració de Bluetooth activada."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vols desconnectar el dispositiu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emissió"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vols desactivar el perfil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Permet gestionar la Wi‑Fi, el Bluetooth, el mode d\'avió, les xarxes mòbils i les VPN."</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Dades mòbils"</string>
     <string name="calls_title" msgid="3544471959217176768">"Trucades"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Missatges SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Missatges SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Permet l\'ús de dades amb la xarxa mòbil."</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Permet ús dades en itinerància"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerància de dades"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivell de seguretat mitjà o alt"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contrasenya"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Nivell de seguretat alt"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Les funcions de protecció del dispositiu deixaran de funcionar."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivat per administrador, política d\'encriptació o emmagatzematge de credencials"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Cap"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Fes lliscar el dit"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Elimina el patró de desbloqueig"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Elimina el PIN de desbloqueig"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Elimina la contrasenya de desbloqueig"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Suprimeix el bloqueig de pantalla."</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Canvia el patró de desbloqueig"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Canvia el PIN de desbloqueig"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Canvia la contrasenya de desbloqueig"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per a música i contingut multimèdia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recorda la configuració"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistent de Wi‑Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connectat mitjançant l\'assistent de Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Emet pantalla"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activa pantalla sense fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No s\'ha trobat cap dispositiu a prop."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Configuració de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configura i gestiona els punts d\'accés sense fil"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Selecciona una xarxa Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Selecciona una xarxa Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"S\'està activant la Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"S\'està desactivant la Wi-Fi..."</string>
@@ -600,8 +602,8 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Cerca xarxes sempre"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Permet sempre la cerca"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permet que el servei d\'ubicacions de Google i altres aplicacions cerquin xarxes, fins i tot si la Wi-Fi està desactivada."</string>
-    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utilitza automàticament Wi-Fi obertes"</string>
-    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permet que un assistent de Wi-Fi es connecti automàticament a les xarxes obertes de qualitat alta"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utilitza automàticament xarxes Wi-Fi obertes"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permet que un assistent de Wi-Fi es connecti automàticament a les xarxes obertes considerades de bona qualitat"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Tria de l\'assistent"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instal·la els certificats"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Per millorar la precisió de la ubicació i per a altres finalitats, Google i altres aplicacions poden cercar xarxes properes tot i que la Wi-Fi estigui desactivada. Si no vols que això passi, accedeix a Avançat &gt; Cerca xarxes sempre."</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ADVERTIMENT: si omets la connexió Wi‑Fi, la tauleta utilitzarà només les dades mòbils per dur a terme les baixades inicials i les actualitzacions. Per evitar els possibles càrrecs per dades, connecta\'t a la xarxa Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ADVERTIMENT: si omets la connexió Wi‑Fi, el dispositiu utilitzarà només les dades mòbils per dur a terme les baixades inicials i les actualitzacions. Per evitar els possibles càrrecs per dades, connecta\'t a la xarxa Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ADVERTIMENT: si omets la connexió Wi‑Fi, el telèfon utilitzarà només les dades mòbils per dur a terme les baixades inicials i les actualitzacions. Per evitar els possibles càrrecs per dades, connecta\'t a la xarxa Wi‑Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Si omets la Wi‑Fi:\n\nLa tauleta no tindrà connexió a Internet.\n\nNo podràs obtenir actualitzacions de programari fins que no et connectis a Internet.\n\nNo podràs activar les funcions de protecció del dispositiu en aquest moment."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Si omets la Wi‑Fi:\n\nEl dispositiu no tindrà connexió a Internet.\n\nNo podràs obtenir actualitzacions de programari fins que no et connectis a Internet.\nNo podràs activar les funcions de protecció del dispositiu en aquest moment.\n"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Si omets la Wi‑Fi:\n\nEl telèfon no tindrà connexió a Internet.\n\nNo podràs obtenir actualitzacions de programari fins que no et connectis a Internet.\n\nNo podràs activar les funcions de protecció del dispositiu en aquest moment."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"La tauleta no ha pogut connectar amb aquesta xarxa Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"El dispositiu no s\'ha pogut connectar a la xarxa Wi‑Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"El telèfon no ha pogut connectar amb aquesta xarxa Wi-Fi."</string>
@@ -833,8 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aixeca\'l per reactivar-lo"</string>
     <string name="doze_title" msgid="2259176504273878294">"Pantalla Ambient"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"La pantalla es reactiva en agafar el dispositiu o en rebre notificacions."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Mida del tipus de lletra"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Mida de la lletra"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuració de bloqueig de targeta SIM"</string>
@@ -1088,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insereix la targeta SIM i reinicia"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connecta a Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"La meva ubicació"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Perfil professional"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ubicació perfil professional"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Desactivada per l\'empresa"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisió"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Estalvi de bateria"</string>
@@ -1442,11 +1437,11 @@
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activa el registre de cerca HCI de Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Captura tots els paquets HCI de Bluetooth en un fitxer"</string>
     <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueig d\'OEM"</string>
-    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permet el desbloqueig del carregador d\'inici."</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permet el desbloqueig del carregador d\'arrencada."</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Introdueix el PIN."</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Per activar el desbloqueig OEM, introdueix el PIN del dispositiu."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vols permetre el desbloqueig d\'OEM?"</string>
-    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVERTIMENT: les característiques de protecció del dispositiu no funcionaran mentre aquesta opció de configuració estigui activada."</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVERTIMENT: les característiques de protecció del dispositiu no funcionaran mentre aquesta opció estigui activada."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificació de pantalla sense fil"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Activa el registre detallat de la Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Traspàs agressiu de Wi-Fi a dades mòbils"</string>
@@ -1853,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inclou dades de l\'aplicació"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauració automàtica"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Quan tornis a instal·lar una aplicació, restaura la configuració i les dades incloses a la còpia de seguretat"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"El servei de còpia de seguretat està inactiu."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Es defineix a la política del dispositiu."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contrasenya per a còpies d\'ordinador"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Les còpies de seguretat d\'ordinador completes no estan protegides"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toca per canviar o eliminar la contrasenya per a còpies de seguretat d\'ordinador completes"</string>
@@ -2320,8 +2313,7 @@
     <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">"Targeta SIM buida"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nom de la targeta SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Introdueix el nom de la SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Ranura per a la targeta SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operador de telefonia mòbil"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
@@ -2331,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Porpra"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"No s\'ha inserit cap targeta SIM."</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Estat de la targeta SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informació relacionada amb la targeta SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Torna la trucada des de la SIM predeterminada"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM per a trucades sortints"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Altres opcions de trucades"</string>
@@ -2474,12 +2465,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Nits entre setmana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora d\'inici"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalització"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"A les <xliff:g id="FORMATTED_TIME">%s</xliff:g> del dia següent"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"A les <xliff:g id="FORMATTED_TIME">%s</xliff:g> o amb qualsevol alarma anterior"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"A les <xliff:g id="FORMATTED_TIME">%s</xliff:g> del dia següent o amb qualsevol alarma anterior"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificacions d\'aplicacions"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuració de les notificacions"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Comentaris sobre aquest dispositiu"</string>
@@ -2500,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Informació sobre l\'IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informació relativa a l\'IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Encriptació"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continua"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Per protegir encara més el dispositiu, pots sol·licitar el PIN abans que no s\'iniciï. Fins que no s\'inicia no pot rebre trucades, missatges ni notificacions, incloses alarmes.\n\nAixò permet protegir les dades dels dispositius perduts o robats."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 23c03ce..3c2dc99 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Odpojit?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tímto způsobem ukončíte připojení k zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nemáte oprávnění měnit nastavení Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Při otevřeném nastavení Bluetooth je zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> viditelné pro zařízení v okolí."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odpojit zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Vysílání"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Deaktivovat profil?"</string>
@@ -290,7 +291,8 @@
     <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>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Povolit využití dat přes mobilní síť"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Povolit data při roamingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Datový roaming"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Střední až vysoké zabezpečení"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Vysoké zabezpečení"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Zakázáno správcem, zásadami šifrování nebo úložištěm pověření"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Žádný"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Přejetí prstem"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odebrat bezpečnostní gesto"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odebrat bezpečnostní kód PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Odebrat bezpečnostní heslo"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Změna bezpečnostního gesta"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Změna bezpečnostního kódu PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Změnit bezpečnostní heslo"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pro hudbu a média"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamatovat nastavení"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Google Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Připojeno pomocí asistenta připojení Wi-Fi"</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>
@@ -584,8 +591,7 @@
     <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>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"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>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Hledání vždy zapnuto"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Vždy povolit vyhledávání sítí"</string>
     <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>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automaticky používat otevřené sítě Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Nechat asistenta Wi‑Fi automaticky se připojit ke kvalitním otevřeným sítím"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Zvolit asistenta"</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 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>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"UPOZORNĚNÍ: Pokud přeskočíte nastavení Wi-Fi, tablet ke stažení počátečních souborů a aktualizací použije pouze mobilní datové připojení. Chcete-li zabránit možným poplatkům za přenos dat, připojte se k síti Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"UPOZORNĚNÍ: Pokud přeskočíte nastavení Wi-Fi, zařízení ke stažení počátečních souborů a aktualizací použije pouze mobilní datové připojení. Chcete-li zabránit možným poplatkům za přenos dat, připojte se k síti Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"UPOZORNĚNÍ: Pokud přeskočíte nastavení Wi-Fi, telefon ke stažení počátečních souborů a aktualizací použije pouze mobilní datové připojení. Chcete-li zabránit možným poplatkům za přenos dat, připojte se k síti Wi‑Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Pokud síť Wi‑Fi přeskočíte:\n\nTablet nebude mít připojení k internetu.\n\nDokud se nepřipojíte k internetu, nebudete dostávat aktualizace softwaru.\n\nNemůžete nyní aktivovat funkce ochrany zařízení."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Pokud síť Wi‑Fi přeskočíte:\n\nZařízení nebude mít připojení k internetu.\n\nDokud se nepřipojíte k internetu, nebudete dostávat aktualizace softwaru.\n\nNemůžete nyní aktivovat funkce ochrany zařízení."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Pokud síť Wi‑Fi přeskočíte:\n\nTelefon nebude mít připojení k internetu.\n\nDokud se nepřipojíte k internetu, nebudete dostávat aktualizace softwaru.\n\nNemůžete nyní aktivovat funkce ochrany zařízení."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tabletu se nepodařilo připojit k této síti Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Zařízení se k této síti Wi-Fi nemohlo připojit."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonu se nepodařilo připojit k této síti Wi-Fi."</string>
@@ -836,8 +836,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Probudit zvednutím zařízení"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambientní displej"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Odemknout obrazovku, když zvednete zařízení nebo vám přijde upozornění"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Velikost písma"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavení zámku SIM karty"</string>
@@ -1017,8 +1016,7 @@
     <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>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"V tomto zařízení jsou přítomni další uživatelé.\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_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>
@@ -1092,12 +1090,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Pracovní profil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Umístění pracovního profilu"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Vypnuto vaší společností"</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>
@@ -1445,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka se při nabíjení nepřepne do režimu spánku"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Povolit protokol Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zachytit všechny pakety Bluetooth HCI do souboru"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Odemknutí OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Povolit odemknutí zavaděče"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Zadejte kód PIN"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Chcete-li povolit odemknutí OEM, zadejte kód PIN zařízení."</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Povolit odemknutí OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORNĚNÍ: Pokud bude toto nastavení zapnuto, nebudou v tomto zařízení fungovat funkce ochrany zařízení."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikace bezdrátového displeje"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Povolit podrobné protokolování Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresivní předání z Wi-Fi na mobilní síť"</string>
@@ -1861,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Zahrnout data aplikací"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatické obnovení"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Při přeinstalaci aplikace obnovit zálohovaná nastavení a další data"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Služba zálohování není aktivní."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Toto je nastaveno zásadami zařízení."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Heslo pro zálohy v počítači"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Úplné zálohy v počítači nejsou v současné době chráněny"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tuto možnost vyberte, chcete-li změnit nebo odebrat heslo pro úplné zálohy v počítači"</string>
@@ -2016,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy použít GPU ke skládání obrazovky"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulovat barevný prostor"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Povolit trasování OpenGL"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Používat AwesomePlayer (zastaralé)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Používat k přehrávání většiny médií namísto přehrávače NuPlayer přehrávač AwsomePlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Vyp. směr. zvuku do USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Vyp. aut. směr. zvuku do zvukových periferií USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Zobrazit ohraničení"</string>
@@ -2330,8 +2317,7 @@
     <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">"Prázdná SIM"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Název SIM karty"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Zadejte název SIM karty"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot pro SIM kartu %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operátor"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Číslo"</string>
@@ -2341,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Nachová"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nejsou vloženy žádné SIM karty"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Stav SIM karty"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Údaje související se SIM kartou"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Volat zpět z výchozí SIM karty"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM karta pro odchozí hovory"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Další nastavení hovorů"</string>
@@ -2484,12 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Víkendy"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Čas zahájení"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Čas ukončení"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Zítra v čase <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"V čase <xliff:g id="FORMATTED_TIME">%s</xliff:g> nebo při jakémkoli dřívějším budíku"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Zítra v čase <xliff:g id="FORMATTED_TIME">%s</xliff:g> nebo při jakémkoli dřívějším budíku"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Oznámení aplikací"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavení oznámení"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Odeslat zpětnou vazbu o tomto zařízení"</string>
@@ -2510,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Informace o kódu IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informace související s kódem IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Šifrování"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Pokračovat"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Toto zařízení můžete dále ochránit tím, že před jeho spuštěním bude požadován kód PIN. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků. \n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 71451f1..237c989 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vil du afbryde?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dette vil afslutte din forbindelse med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Du har ikke tilladelse til at ændre Bluetooth-indstillinger."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er synlig for enheder i nærheden, når Bluetooth-indstillingerne er aktiveret."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er synlig for enheder i nærheden, når Bluetooth-indstillingerne er åbne."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vil du afbryde <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Dataudveksling"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vil du deaktivere profilen?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Administrer Wi-Fi, Bluetooth, flytilstand, mobilnetværk og VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobildata"</string>
     <string name="calls_title" msgid="3544471959217176768">"Opkald"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Sms-beskeder"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Sms-beskeder"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Tillad databrug via mobilnetværk"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Tillad dataforbrug ved roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium til høj sikkerhed"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Adgangskode"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Høj sikkerhed"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funktionerne til enhedsbeskyttelse vil ikke fungere længere."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Deaktiveret af administrator, kryptering eller loginlager"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Stryg"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjern mønster til at låse op"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjern pinkode til at låse op"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Fjern adgangskode til at låse op"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Fjern skærmlås"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Skift mønster til at låse op"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Skift pinkode til at låse op"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Skift adgangskode til at låse op"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Til musik og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk indstillinger"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi-assistent"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Forbindelse via Wi-Fi-assistent"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Skærm til casting"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktivér trådløs skærm"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Der blev ikke fundet enheder i nærheden."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Indstillinger for Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Konfiguration og administration af trådløse adgangspunkter"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Vælg Wi-Fi-netværk"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Vælg Wi-Fi-netværk"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Aktiverer Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Deaktiverer Wi-Fi..."</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ADVARSEL! Hvis du springer over Wi-Fi, vil din tablet kun bruge mobildata til indledende downloads og opdateringer. Opret forbindelse til Wi-Fi for at undgå eventuelle gebyrer for datatrafik."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ADVARSEL! Hvis du springer over Wi-Fi, vil din enhed kun bruge mobildata til indledende downloads og opdateringer. Opret forbindelse til Wi-Fi for at undgå eventuelle gebyrer for datatrafik."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ADVARSEL! Hvis du springer over Wi-Fi, vil telefonen kun bruge mobildata til indledende downloads og opdateringer. Opret forbindelse til Wi-Fi for at undgå eventuelle gebyrer for datatrafik."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Hvis du springer Wi-Fi over:\n\nDin tablet vil ikke have en internetforbindelse.\n\nDu vil ikke få softwareopdateringer, indtil du opretter forbindelse til internettet.\n\nDet er ikke muligt at aktivere funktioner til enhedsbeskyttelse på nuværende tidspunkt."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Hvis du springer Wi-Fi over:\n\nEnheden vil ikke have en internetforbindelse.\n\n Du vil ikke få softwareopdateringer, indtil du opretter forbindelse til internettet.\n\nDet er ikke muligt at aktivere funktioner til enhedsbeskyttelse på nuværende tidspunkt."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Hvis du springer Wi-Fi over:\n\nDin telefon vil ikke have en internetforbindelse.\n\nDu vil ikke få softwareopdateringer, indtil du opretter forbindelse til internettet.\n\nDet er ikke muligt at aktivere funktioner til enhedsbeskyttelse på nuværende tidspunkt."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tabletten kunne ikke oprette forbindelse til dette Wi-Fi-netværk."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Enheden kunne ikke oprette forbindelse til dette Wi-Fi-netværk."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonen kunne ikke oprette forbindelse til dette Wi-Fi-netværk."</string>
@@ -833,8 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Løft enheden for at vække den"</string>
     <string name="doze_title" msgid="2259176504273878294">"Aktiv låseskærm"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Væk skærmen, når du tager enheden op eller modtager meddelelser"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Skriftstørrelse"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Indstillinger for lås af SIM-kort"</string>
@@ -1088,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Indsæt SIM-kort, og genstart"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Opret forbindelse til internettet"</string>
     <string name="location_title" msgid="1029961368397484576">"Min placering"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Arbejdsprofil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Placering for arbejdsprofil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Slukket af din virksomhed"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Tilstand"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Høj nøjagtighed"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batteribesparende"</string>
@@ -1441,16 +1436,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skærmen går ikke i dvale under opladning"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktivér Bluetooth HCI snoop log"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Gem alle Bluetooth HCI-pakker i en fil"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-oplåsning"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Tillad, at startindlæseren låses op"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Indtast din pinkode"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Indtast pinkoden for din enhed for at aktivere OEM-oplåsning"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vil du tillade OEM-oplåsning?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVARSEL! Funktioner, der beskytter enheden, fungerer ikke på denne enhed, når denne indstilling er slået til."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificering af trådløs skærm"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktivér detaljeret Wi-Fi-logføring"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Gennemtving skift fra Wi-Fi til mobildata"</string>
@@ -1857,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inkluder appdata"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk gendannelse"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Når du geninstallerer en app, skal du gendanne sikkerhedskopierede indstillinger og data"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Tjenesten til sikkerhedskopiering er inaktiv."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Denne indstilles af din enhedspolitik."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Kode til lokal sikkerhedskopi"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Lokale fuldstændige sikkerhedskopieringer er i øjeblikket ikke beskyttet"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tryk for at skifte eller fjerne adgangskoden til fuld lokal sikkerhedskopiering"</string>
@@ -2012,10 +2001,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Brug altid GPU til skærmsammensætning"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simuler farverum"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktivér OpenGL-spor"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Brug AwesomePlayer (forældet)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Brug AwesomePlayer i stedet for NuPlayer til de fleste typer medieafspilning"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Slå USB-lydhåndtering fra"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Slå autom. lydhåndtering fra for USB-lydenheder"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Vis layoutgrænser"</string>
@@ -2326,8 +2313,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-kort: <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Intet SIM-kort"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Navn på SIM-kort"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Indtast SIM-kortnavn"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-indgang %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Mobilselskab"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nummer"</string>
@@ -2337,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lilla"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Der er ikke isat et SIM-kort"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM-status"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM-relaterede oplysninger"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Ring tilbage fra standard-SIM-kort"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-kort til udgående opkald"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Andre indstillinger for opkald"</string>
@@ -2480,12 +2465,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Hverdagsaftener"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttidspunkt"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttidspunkt"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næste dag"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> eller en tidligere alarm"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næste dag eller en tidligere alarm"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appunderretninger"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Indstillinger for underretninger"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback om denne enhed"</string>
@@ -2506,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-oplysninger"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Relative IMEI-oplysninger"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Kryptering"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsæt"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Du kan beskytte denne enhed yderligere ved at kræve din pinkode, før den starter. Enheden kan hverken modtage opkald, beskeder eller underretninger, herunder alarmer, før den er startet op. \n\nDette medvirker til at beskytte data på mistede eller stjålne enheder."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 26deaea..ead8e38 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Verbindung trennen?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hierdurch wird die Verbindung mit&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; getrennt."</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Sie sind nicht zur Änderung der Bluetooth-Einstellungen berechtigt."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist bei aktiviertem Bluetooth für Geräte in der Nähe sichtbar."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Verbindung mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> trennen?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Übertragung"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil deaktivieren?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"WLAN, Bluetooth, Flugmodus, Mobilfunknetze und VPNs verwalten"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobilfunkdaten"</string>
     <string name="calls_title" msgid="3544471959217176768">"Anrufe"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Datennutzung über Mobilfunknetz zulassen"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Datennutzung bei Roaming zulassen"</string>
     <string name="roaming" msgid="3596055926335478572">"Daten-Roaming"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Mittlere bis hohe Sicherheit"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passwort"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Hohe Sicherheit"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Von Admin, Richtlinie oder Anmeldedaten deaktiviert"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Keine"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Wischen"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Entsperrungsmuster entfernen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Entsperrungs-PIN entfernen"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Entsperrungspasswort entfernen"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Entsperrungsmuster ändern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Entsperrungs-PIN ändern"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Entsperrungspasswort ändern"</string>
@@ -556,6 +562,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Für Musik und Medien"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Einstellungen speichern"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Über WLAN-Assistenten verbunden"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Bildschirmübertragung"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Kabellose Übertragung aktivieren"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Kein Gerät in der Nähe gefunden"</string>
@@ -585,8 +592,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"WLAN-Einstellungen"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"WLAN"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"WLAN-Zugangspunkte festlegen und verwalten"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"WLAN auswählen"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"WLAN auswählen"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"WLAN wird aktiviert…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"WLAN wird deaktiviert…"</string>
@@ -697,12 +703,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"Achtung: Wenn Sie die WLAN-Option überspringen, nutzt Ihr Tablet eine Mobilfunkverbindung für erste Downloads und Updates. Um potenzielle Datengebühren zu vermeiden, stellen Sie eine WLAN-Verbindung her."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"Achtung: Wenn Sie die WLAN-Option überspringen, nutzt Ihr Gerät eine Mobilfunkverbindung für erste Downloads und Updates. Um potenzielle Datengebühren zu vermeiden, stellen Sie eine WLAN-Verbindung her."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"Achtung: Wenn Sie die WLAN-Option überspringen, nutzt Ihr Telefon eine Mobilfunkverbindung für erste Downloads und Updates. Um potenzielle Datengebühren zu vermeiden, stellen Sie eine WLAN-Verbindung her."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Beachten Sie Folgendes, wenn Sie die WLAN-Option überspringen:\n\nAuf Ihrem Tablet besteht dann keine Internetverbindung.\n\nSie erhalten erst Software-Updates, nachdem Sie eine Internetverbindung hergestellt haben.\n\nSie können derzeit keine Geräteschutzfunktionen aktivieren."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Beachten Sie Folgendes, wenn Sie die WLAN-Option überspringen:\n\nAuf Ihrem Gerät besteht dann keine Internetverbindung.\n\nSie erhalten erst Software-Updates, nachdem Sie eine Internetverbindung hergestellt haben.\n\nSie können derzeit keine Geräteschutzfunktionen aktivieren."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Beachten Sie Folgendes, wenn Sie die WLAN-Option überspringen:\n\nAuf Ihrem Telefon besteht dann keine Internetverbindung.\n\nSie erhalten erst Software-Updates, nachdem Sie eine Internetverbindung hergestellt haben.\n\n Sie können derzeit keine Geräteschutzfunktionen aktivieren."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Das Tablet konnte nicht auf dieses WLAN zugreifen."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Das Gerät konnte nicht auf dieses WLAN-Netzwerk zugreifen."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Das Telefon konnte nicht auf dieses WLAN zugreifen."</string>
@@ -1088,12 +1091,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Legen Sie die SIM ein und starten das Gerät neu."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Bitte stellen Sie eine Verbindung zum Internet her."</string>
     <string name="location_title" msgid="1029961368397484576">"Mein Standort"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Arbeitsprofil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Standort für Arbeitsprofil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Vom Unternehmen deaktiviert"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hohe Genauigkeit"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Energiesparmodus"</string>
@@ -1853,10 +1853,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"App-Daten einschließen"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Autom. Wiederherstellung"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Nach der Neuinstallation einer App gesicherte Einstellungen und Daten wiederherstellen"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Der Sicherungsdienst ist inaktiv."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Dies wird durch Ihre Geräterichtlinien festgelegt."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop-Sicherungspasswort"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Vollständige Desktop-Sicherungen sind momentan nicht passwortgeschützt."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Zum Ändern oder Entfernen des Passworts für vollständige Desktop-Sicherungen berühren"</string>
@@ -2320,8 +2318,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-Karte <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM-Karte ist leer."</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Name der SIM-Karte"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Namen der SIM-Karte eingeben"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-Steckplatz %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Mobilfunkanbieter"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nummer"</string>
@@ -2331,7 +2328,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lila"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Keine SIM-Karte eingelegt"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status der SIM-Karte"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informationen zur SIM-Karte"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Über Standard-SIM-Karte zurückrufen"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-Karte für ausgehende Anrufe"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Sonstige Anrufeinstellungen"</string>
@@ -2497,7 +2493,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-Informationen"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informationen zur relativen IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Verschlüsselung"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Weiter"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Sie können dieses Gerät noch weiter schützen, indem Sie festlegen, dass vor dem Gerätestart die Eingabe Ihrer PIN erforderlich ist. Bis das Gerät startet, können weder Anrufe noch Nachrichten, Benachrichtigungen oder Alarme empfangen werden. \n\nSo schützen Sie Daten auf verloren gegangenen oder gestohlenen Geräten."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f435716..a83f358 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Αποσύνδεση;"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Θα τερματιστεί η σύνδεσή σας με τη συσκευή:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Δεν έχετε άδεια να αλλάξετε τις ρυθμίσεις Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Το <xliff:g id="DEVICE_NAME">%1$s</xliff:g> είναι ορατό σε κοντινές συσκευές όταν είναι ανοικτές οι Ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> είναι ορατή σε κοντινές συσκευές όταν είναι ανοικτές οι Ρυθμίσεις Bluetooth."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Να αποσυνδεθεί η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Μετάδοση"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Απενεργοπ. προφίλ;"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Διαχείριση Wi‑Fi, Bluetooth, λειτουργίας πτήσης, δικτύων κινητής τηλεφωνίας και VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Δεδομένα κινητής τηλεφωνίας"</string>
     <string name="calls_title" msgid="3544471959217176768">"Κλήσεις"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Μηνύματα SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Μηνύματα SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Επιτρ. χρήση δεδομ. σε δίκτυο κιν. τηλ."</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Επιτρ. η χρήση δεδ. σε περιαγ."</string>
     <string name="roaming" msgid="3596055926335478572">"Περιαγωγή δεδομένων"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Μεσαίο έως υψηλό επίπεδο ασφάλειας"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Κωδικός πρόσβασης"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Υψηλό επίπεδο ασφάλειας"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Οι λειτουργίες προστασίας της συσκευής δεν θα λειτουργούν πλέον."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Απενεργοποιήθηκε λόγω διαχειριστή, πολιτικής κρυπτογράφησης ή χώρου αποθήκευσης διαπιστευτηρίων"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Κανένα"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Ολίσθηση"</string>
@@ -410,6 +411,7 @@
     <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_password_summary" msgid="192161194564577025">"Κατάργηση κωδικού πρόσβασης ξεκλειδώματος"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Κατάργηση κλειδώματος οθόνης"</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_password_title" msgid="5606298470358768865">"Αλλαγή κωδικού πρόσβασης ξεκλειδώματος"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Για μουσική και πολυμέσα"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Διατήρηση ρυθμίσεων"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Βοηθός Wi-Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Σύνδεση μέσω βοηθού Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Μετάδοση οθόνης"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ενεργοποίηση ασύρματης οθόνης"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Δεν βρέθηκαν κοντινές συσκευές."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Ρυθμίσεις Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ορισμός &amp; διαχείριση ασύρματων σημείων πρόσβασης"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Επιλέξτε το δίκτυο Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Επιλογή δικτύου Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Ενεργοποίηση του Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Απενεργοποίηση του Wi-Fi…"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αν παραλείψετε το Wi‑Fi, το tablet σας θα χρησιμοποιεί μόνο δεδομένα κινητής τηλεφωνίας για αρχικές λήψεις και ενημερώσεις. Για να αποφύγετε πιθανές χρεώσεις δεδομένων, συνδεθείτε σε Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αν παραλείψετε το Wi‑Fi, η συσκευή σας θα χρησιμοποιεί μόνο δεδομένα κινητής τηλεφωνίας για αρχικές λήψεις και ενημερώσεις. Για να αποφύγετε πιθανές χρεώσεις δεδομένων, συνδεθείτε σε Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αν παραλείψετε το Wi‑Fi, το τηλέφωνό σας θα χρησιμοποιεί μόνο δεδομένα κινητής τηλεφωνίας για αρχικές λήψεις και ενημερώσεις. Για να αποφύγετε πιθανές χρεώσεις δεδομένων, συνδεθείτε σε Wi‑Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Εάν παραλείψετε το Wi‑Fi:\n\nΤο tablet σας δεν θα έχει σύνδεση στο διαδίκτυο.\n\nΔεν θα λαμβάνετε ενημερώσεις λογισμικού έως ότου συνδεθείτε στο διαδίκτυο.\n\nΔεν μπορείτε να ενεργοποιήσετε προς το παρόν λειτουργίες προστασίας της συσκευής."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Εάν παραλείψετε το Wi‑Fi:\n\nΗ συσκευή σας δεν θα έχει σύνδεση στο διαδίκτυο.\n\nΔεν θα λαμβάνετε ενημερώσεις λογισμικού έως ότου συνδεθείτε στο διαδίκτυο.\n\nΔεν μπορείτε να ενεργοποιήσετε προς το παρόν λειτουργίες προστασίας της συσκευής."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Εάν παραλείψετε το Wi‑Fi:\n\nΤο τηλέφωνό σας δεν θα έχει σύνδεση στο διαδίκτυο.\n\nΔεν θα λαμβάνετε ενημερώσεις λογισμικού έως ότου συνδεθείτε στο διαδίκτυο.\n\nΔεν μπορείτε να ενεργοποιήσετε προς το παρόν λειτουργίες προστασίας της συσκευής."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Δεν ήταν δυνατή η σύνδεση του tablet σε αυτό το δίκτυο Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Η συσκευή δεν ήταν δυνατό να συνδεθεί σε αυτό το δίκτυο Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Δεν ήταν δυνατή η σύνδεση του τηλεφώνου σε αυτό το δίκτυο Wi-Fi."</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Εισαγάγετε την κάρτα SIM και κάντε επανεκκίνηση"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Συνδεθείτε στο διαδίκτυο"</string>
     <string name="location_title" msgid="1029961368397484576">"Η τοποθεσία μου"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Προφίλ εργασίας"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Τοποθεσία για προφίλ εργασίας"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Απενεργοποίηση από την εταιρεία"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Λειτουργία"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Υψηλή ακρίβεια"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Εξοικονόμησης μπαταρίας"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Συμπερίληψη δεδομ. εφαρμογής"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Αυτόματη επαναφορά"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Κατά την εκ νέου εγκατάσταση μιας εφαρμογής, ανακτήστε τις ρυθμίσεις και τα δεδομένα για τα οποία έχετε δημιουργήσει αντίγραφα ασφαλείας"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Η υπηρεσία αντιγράφων ασφαλείας είναι ανενεργή."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Η υπηρεσία αυτή ορίζεται από την πολιτική της συσκευής σας."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Κωδ.πρόσβ.αντ.ασφ.επιφ.εργ."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας δεν προστατεύονται αυτήν τη στιγμή"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Αγγίξτε για αλλαγή ή κατάργηση του κωδικού πρόσβασης για τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας"</string>
@@ -2319,8 +2313,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Πληκτρολογήστε το όνομα SIM"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for sim_editor_title (4034301817366627870) -->
     <skip />
@@ -2332,7 +2325,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"Άλλες ρυθμίσεις κλήσης"</string>
@@ -2498,7 +2490,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Διατήρηση οριζόντιας προβολής"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Διατήρηση τρέχοντος προσανατολισμού"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Πληροφορίες IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Σχετικές πληροφορίες IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Κρυπτογράφηση"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Συνέχεια"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Μπορείτε να προστατεύσετε ακόμα περισσότερο αυτήν τη συσκευή πραγματοποιώντας αίτημα κωδικού PIN πριν από την έναρξη της λειτουργίας της. Μέχρι να αρχίσει να λειτουργεί η συσκευή, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων σας σε περίπτωση κλοπής ή απώλειας της συσκευής σας."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 52b3a4d..fad1ef7 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnect?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"You don\'t have permission to change Bluetooth settings."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while Bluetooth Settings is open."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while Bluetooth settings is open."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Manage Wi‑Fi, Bluetooth, aeroplane mode, mobile networks, &amp; VPNs"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobile data"</string>
     <string name="calls_title" msgid="3544471959217176768">"Calls"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS Messages"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS messages"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Allow data usage over mobile network"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Allow data usage when roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Data roaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium to high security"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"High security"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Device protection features will no longer work."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disabled by administrator, encryption policy or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Swipe"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remove unlock pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remove unlock PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Remove unlock password"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Remove screen lock"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Change unlock pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connected via Wi‑Fi assistant"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Cast screen"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
@@ -2320,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Purple"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"No SIM cards inserted"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM status"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM related information"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Call back from default SIM"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM for outgoing calls"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Other call settings"</string>
@@ -2486,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI information"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-related information"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Encryption"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continue"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\'t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 52b3a4d..fad1ef7 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnect?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"You don\'t have permission to change Bluetooth settings."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while Bluetooth Settings is open."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while Bluetooth settings is open."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Manage Wi‑Fi, Bluetooth, aeroplane mode, mobile networks, &amp; VPNs"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobile data"</string>
     <string name="calls_title" msgid="3544471959217176768">"Calls"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS Messages"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS messages"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Allow data usage over mobile network"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Allow data usage when roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Data roaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium to high security"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"High security"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Device protection features will no longer work."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disabled by administrator, encryption policy or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Swipe"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remove unlock pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remove unlock PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Remove unlock password"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Remove screen lock"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Change unlock pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connected via Wi‑Fi assistant"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Cast screen"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
@@ -2320,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Purple"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"No SIM cards inserted"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM status"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM related information"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Call back from default SIM"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM for outgoing calls"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Other call settings"</string>
@@ -2486,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI information"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-related information"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Encryption"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continue"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\'t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d7f6a19..0fb8656 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Esto pondrá fin a tu conexión con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"No tienes permiso para cambiar la configuración de Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Dispos. cercanos ven <xliff:g id="DEVICE_NAME">%1$s</xliff:g> si config. Bluetooth abierta"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Los dispositivos cercanos pueden ver a <xliff:g id="DEVICE_NAME">%1$s</xliff:g> si la configuración de Bluetooth está abierta."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"¿Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisión"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"¿Inhabilitar perfil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Administrar Wi-Fi, Bluetooth, modo de avión, redes móviles y VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Datos móviles"</string>
     <string name="calls_title" msgid="3544471959217176768">"Llamadas"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mensajes SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Mensajes SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Permitir el uso de datos por red móvil"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Permitir usar datos en roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de datos"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivel de seguridad medio a alto"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Nivel de seguridad alto"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Las funciones de protección del dispositivo ya no funcionarán."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inhabilitado por administrador, política de encriptación o almacenamiento de credenciales"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminar el patrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminar el PIN de desbloqueo"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Eliminar la contraseña de desbloqueo"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Eliminar bloqueo de pantalla"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambiar patrón de desbloqueo"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar la contraseña de desbloqueo"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y medios"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recordar la configuración"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistente de Wi-Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conexión por asistente de Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Pantalla de Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No se encontraron dispositivos cercanos."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Configuración de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar y administrar los puntos de acceso de teléfonos inalámbricos"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Seleccionar red Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Seleccionar red Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Activando Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Desactivando Wi-Fi..."</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ADVERTENCIA: Si omites la conexión Wi‑Fi, la tablet solo usará datos móviles para acceder a descargas y actualizaciones iniciales. Si quieres evitar posibles cargos por uso de datos, conéctate a una red Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ADVERTENCIA: Si omites la conexión Wi‑Fi, el dispositivo solo usará datos móviles para acceder a descargas y actualizaciones iniciales. Si quieres evitar posibles cargos por uso de datos, conéctate a una red Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ADVERTENCIA: Si omites la conexión Wi‑Fi, el teléfono solo usará datos móviles para acceder a descargas y actualizaciones iniciales. Si quieres evitar posibles cargos por uso de datos, conéctate a una red Wi-Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Si omites la conexión Wi‑Fi:\n\nLa tablet no tendrá conexión a Internet.\n\nNo recibirás actualizaciones de software hasta que te conectes a Internet.\n\nMientras tanto, no podrás activar las funciones de protección del dispositivo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Si omites la conexión Wi‑Fi:\n\nEl dispositivo no tendrá conexión a Internet.\n\nNo recibirás actualizaciones de software hasta que te conectes a Internet.\n\nMientras tanto, no podrás activar las funciones de protección del dispositivo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Si omites la conexión Wi‑Fi:\n\nEl teléfono no tendrá conexión a Internet.\n\nNo recibirás actualizaciones de software hasta que te conectes a Internet.\n\nMientras tanto, no podrás activar las funciones de protección del dispositivo."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"La tablet no pudo conectarse a esta red Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"El dispositivo no se pudo conectar a esta red Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"El dispositivo no pudo conectarse a esta red Wi-Fi."</string>
@@ -833,8 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar el dispositivo para activarlo"</string>
     <string name="doze_title" msgid="2259176504273878294">"Pantalla ambiente"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Permite activar la pantalla cuando recoges el dispositivo o recibes notificaciones."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño de fuente"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo de la tarjeta SIM"</string>
@@ -1088,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserta la tarjeta SIM y reinicia."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conéctate a Internet."</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Perfil de trabajo"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ubicación de perfil de trabajo"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Desactivada por la empresa"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Precisión alta"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ahorro de batería"</string>
@@ -1853,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluir datos de aplicación"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restaurar automáticamente"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Al reinstalar se restablece la configuración con copia de seguridad."</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Servicio de copia de seguridad inactivo"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Esta opción es establecida por la política de dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contras. copia de seguridad"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Tus copias de seguridad completas de escritorio no están protegidas por contraseña."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toca para cambiar o eliminar la contraseña de las copias de seguridad completas de tu escritorio."</string>
@@ -2320,8 +2313,7 @@
     <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 vacía"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nombre de SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Ingresar nombre de tarjeta SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Ranura de SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Proveedor"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
@@ -2331,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Púrpura"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"No se insertó ninguna tarjeta SIM."</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Estado de SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Información relacionada con la tarjeta SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Devolver la llamada desde la tarjeta SIM predeterminada"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Tarjeta SIM para llamadas salientes"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Otras configuraciones de llamada"</string>
@@ -2474,12 +2465,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noches entre semana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de inicio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalización"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> el día siguiente"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> o cualquier alarma anterior"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> el día siguiente o cualquier alarma anterior"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
@@ -2500,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Información de IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Información relacionada con IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Encriptación"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Puedes solicitar el PIN del dispositivo antes de iniciarlo para aumentar la protección. Hasta que el dispositivo no se inicie, no podrá recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta configuración ayuda a proteger los datos en dispositivos perdidos o robados."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2c72791..6837ca7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Finalizará la conexión con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"No tienes permiso para cambiar los ajustes de Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será visible para dispositivos cercanos mientras los ajustes de Bluetooth estén abiertos."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será visible para dispositivos cercanos mientras los ajustes de Bluetooth estén abiertos."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"¿Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emisiones"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"¿Inhabilitar perfil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Administrar Wi-Fi, Bluetooth, modo avión, redes móviles y redes privadas virtuales"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Datos móviles"</string>
     <string name="calls_title" msgid="3544471959217176768">"Llamadas"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mensajes SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Mensajes SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Permitir uso de datos en redes móviles"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Permitir uso datos itinerancia"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerancia de datos"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Seguridad media-alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Seguridad alta"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Las funciones de protección del dispositivo ya no funcionarán."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivado por el administrador, política de cifrado o almacenamiento de credenciales"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminar patrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminar PIN de desbloqueo"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Eliminar contraseña de desbloqueo"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Eliminar bloqueo de pantalla"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambiar patrón desbloqueo"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar contraseña de desbloqueo"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y contenido multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ajustes de recordatorio"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistente de Wi‑Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conectado a través de asistente Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Enviar pantalla"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No hay dispositivos cercanos."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Ajustes de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar y administrar puntos de acceso inalámbricos"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Seleccionar red Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Selecciona una red Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Activando Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Desactivando Wi‑Fi…"</string>
@@ -602,7 +604,7 @@
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permitir que el servicio de ubicación de Google y otras aplicaciones busquen redes aunque la conexión Wi-Fi esté desactivada"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Usar redes Wi‑Fi abiertas automáticamente"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Dejar que un asistente de Wi‑Fi se conecte automáticamente a redes abiertas consideradas de buena calidad"</string>
-    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Elegir asistente"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Elige un asistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mejorar la precisión de la ubicación y otros fines, Google y otras aplicaciones pueden buscar redes cercanas aunque la conexión Wi-Fi esté desactivada. Si no quieres que esto ocurra, accede a Ajustes avanzados &gt; Buscar redes siempre."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Las aplicaciones pueden buscar redes cercanas aunque la conexión Wi-Fi esté desactivada. Si no quieres que esto ocurra, accede a Ajustes avanzados &gt; Buscar redes siempre."</string>
@@ -696,12 +698,9 @@
     <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>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Si te saltas el paso de la conexión Wi‑Fi:\n\nTu tablet no tendrá conexión a Internet.\n\nNo obtendrás actualizaciones de software hasta que te conectes a Internet.\n\nNo podrás activar las funciones de protección del dispositivo en este momento."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Si te saltas el paso de la conexión Wi‑Fi:\n\nTu dispositivo no tendrá conexión a Internet.\n\nNo obtendrás actualizaciones de software hasta que te conectes a Internet.\n\nNo podrás activar las funciones de protección del dispositivo en este momento."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Si te saltas el paso de la conexión Wi‑Fi:\n\nTu teléfono no tendrá conexión a Internet.\n\nNo obtendrás actualizaciones de software hasta que te conectes a Internet.\n\nNo podrás activar las funciones de protección del dispositivo en este momento."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"El tablet no se ha podido conectar a esta red Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"El dispositivo no se ha podido conectar a esta red Wi‑Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"El teléfono no se ha podido conectar a esta red Wi‑Fi."</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserta la tarjeta SIM y reinicia el dispositivo"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Debes conectarte a Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Perfil de trabajo"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ubicación para el perfil de trabajo"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Desactivado por tu empresa"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisión"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ahorro de batería"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluir datos de aplicaciones"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Cuando vuelvas a instalar una aplicación, restaurar la configuración y los datos incluidos en la copia"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"El servicio de copia de seguridad está inactivo."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Establecido por la política de tu dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contraseña para copias de ordenador"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Las copias de seguridad completas de ordenador no están protegidas"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tocar para cambiar o eliminar la contraseña para las copias de seguridad completas de ordenador"</string>
@@ -2319,8 +2313,7 @@
     <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 vacía"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nombre de la SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Introduce el nombre de SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Ranura de SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operador"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Violeta"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"No se ha insertado ninguna tarjeta SIM"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Estado de SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Información relacionada con la tarjeta SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Volver a llamar desde SIM predeterminada"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM para hacer llamadas"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Otras opciones de llamada"</string>
@@ -2496,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Información del IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Información relacionada con el IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Cifrado"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Puedes solicitar el PIN del dispositivo antes de iniciarlo para aumentar la protección. Hasta que el dispositivo no se inicie, no podrá recibir llamadas, mensajes ni notificaciones, como alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados."</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index c37e0b4..bacd2c5 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Kas katkestada ühendus?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"See lõpetab teie ühenduse seadmega:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Teil ei ole luba Bluetoothi seadete muutmiseks."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> on lähiseadmetele nähtav, kui Bluetoothi seaded on avatud."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Kas katkestada ühendus seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Edastamine"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Kas profiil keelata?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"WiFi, Bluetoothi, lennukirežiimi ja mobiilsidevõrkude ning VPN-ide haldamine"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobiilne andmeside"</string>
     <string name="calls_title" msgid="3544471959217176768">"Kõned"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS-sõnumid"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Luba andmekasutus mobiilsidevõrgu kaudu"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Luba andmekas. rändluse ajal"</string>
     <string name="roaming" msgid="3596055926335478572">"Andmesiderändlus"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keskmine kuni kõrge turvalisus"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parool"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Kõrge turvalisus"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Keelanud admin., krüptimiseeskiri või mand. mälu"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Puudub"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Pühkimine"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eemalda avamismuster"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eemalda avamise PIN-kood"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Eemalda avamise parool"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Avamismustri muutmine"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuda avamise PIN-koodi"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Avamisparooli muutmine"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muusika ja meediumi jaoks"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Jäta seaded meelde"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"WiFi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Ühendatud WiFi-abi kaudu"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Cast-ekraan"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Luba juhtmeta ekraaniühendus"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Läheduses seadmeid ei leitud."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"WiFi-seaded"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"WiFi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Määra ja halda traadita pääsupunkte"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"WiFi-võrgu valimine"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"WiFi valimine"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"WiFi sisselülitamine ..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"WiFi väljalülitamine ..."</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"HOIATUS. Kui jätate WiFi vahele, siis kasutab tahvelarvuti esmasteks allalaadimisteks ja värskendamiseks ainult mobiilset andmesidet. Võimalike andmeside tasude vältimiseks ühendage tahvelarvuti WiFi-võrku."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"HOIATUS. Kui jätate WiFi vahele, siis kasutab seade esmasteks allalaadimisteks ja värskendamiseks ainult mobiilset andmesidet. Võimalike andmeside tasude vältimiseks ühendage seade WiFi-võrku."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"HOIATUS. Kui jätate WiFi vahele, siis kasutab telefon esmasteks allalaadimisteks ja värskendamiseks ainult mobiilset andmesidet. Võimalike andmeside tasude vältimiseks ühendage telefon WiFi-võrku."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Kui te ei loo WiFi-ühendust:\n\ntahvelarvutil ei ole Interneti-ühendust;\n\nte ei saa tarkvaravärskendusi enne, kui olete loonud Interneti-ühenduse;\n\nte ei saa sel ajal seadme kaitsefunktsioone aktiveerida."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Kui te ei loo WiFi-ühendust:\n\nseadmel ei ole Interneti-ühendust;\n\nte ei saa tarkvaravärskendusi enne, kui olete loonud Interneti-ühenduse;\n\nte ei saa sel ajal seadme kaitsefunktsioone aktiveerida."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Kui te ei loo WiFi-ühendust:\n\ntelefonil ei ole Interneti-ühendust;\n\nte ei saa tarkvaravärskendusi enne, kui olete loonud Interneti-ühenduse;\n\nte ei saa sel ajal seadme kaitsefunktsioone aktiveerida."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tahvelarvutil ei õnnestunud luua ühendust selle WiFi-võrguga."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Seadmel ei õnnestunud WiFi-võrguga ühendust luua."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonil ei õnnestunud luua ühendust selle WiFi-võrguga."</string>
@@ -1087,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sisestage SIM-kaart ja taaskäivitage"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Looge Interneti-ühendus"</string>
     <string name="location_title" msgid="1029961368397484576">"Minu asukoht"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Tööprofiil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Tööprofiili asukoht"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Ettevõte on välja lülitanud"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Režiim"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Väga täpne"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Aku säästmine"</string>
@@ -1440,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekraan ei lähe kunagi laadimise ajal unerežiimi"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Luba Bluetoothi HCI jälgimise logi"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Hõiva kõik faili Bluetoothi HCI paketid"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM-i avamine"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Luba buudilaadur avada"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Sisestage PIN-kood"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM-i avamise lubamiseks sisestage seadme PIN-kood"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Kas lubada OEM-i avamine?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"HOIATUS! Kui see seade on sisse lülitatud, ei toimi seadme turvafunktsioonid."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Juhtmeta ekraaniühenduse sertifitseerimine"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Luba WiFi paljusõnaline logimine"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agressiivne WiFi-lt mobiilile üleminek"</string>
@@ -1856,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Kaasa rakenduse andmed"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automaatne taastamine"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Rakenduse uuesti installimisel taasta varundatud seaded ja andmed"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Varundamisteenus ei ole aktiivne."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Selle määravad teie seadmereeglid."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Arvutivarunduse parool"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Täielikud arvutivarundused pole praegu kaitstud"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Puudutage, et muuta või eemaldada täielike arvutivarunduste parool"</string>
@@ -2011,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Kasuta alati GPU-d kuva koostamisel"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Modelleeri värviruumi"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Luba OpenGL-i jälgimine"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Kas. AwesomePlayerit (aegunud)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Kasuta meediumi esitamiseks NuPlayeri asemel AwesomePlayerit"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB-heli mars. keelamine"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Auto. marsruut. keelamine väl. USB-heliseadmetesse"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Näita paigutuse piire"</string>
@@ -2325,8 +2317,7 @@
     <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-kaart on tühi"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM-kaardi nimi"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Sisestage SIM-kaardi nimi"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-kaardi pesa %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operaator"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Number"</string>
@@ -2336,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lilla"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Ühtegi SIM-kaarti pole sisestatud"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM-kaardi olek"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM-kaardiga seotud teave"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Tagasihelistamine vaike-SIM-kaardilt"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-kaart väljuvate kõnede jaoks"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Muud kõne seaded"</string>
@@ -2502,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI teave"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI suhteline teave"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Krüpteerimine"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Jätka"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Seadme täiendavaks kaitsmiseks võite määrata, et seade nõuab käivitumiseks PIN-koodi sisestamist. Kuni seade pole käivitunud, ei saa see vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme. \n\nSee aitab kaitsta andmeid seadme kaotsimineku või varguse korral."</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 38526e2..a6e16dd 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Deskonektatu?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Gailu honekin duzun konexioa amaituko da:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Ez daukazu Bluetooth-ezarpenak aldatzeko baimenik."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Bluetooth ezarpenak irekita badaude, inguruko gailuek <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ikusi ahal izango dute."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth ezarpenak irekita badaude, inguruko gailuek <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ikusi ahal izango dute."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatu nahi duzu?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Igorpena"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profila desgaitu?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Kudeatu Wi‑Fi eta Bluetooth konexioak, hegaldi modua, sare mugikorrak eta VPNak"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Datu mugikorrak"</string>
     <string name="calls_title" msgid="3544471959217176768">"Deiak"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS mezuak"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS mezuak"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Onartu datu mugikorrak erabiltzea"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Onartu datuak ibiltaritzan"</string>
     <string name="roaming" msgid="3596055926335478572">"Ibiltaritzako datuak"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurtasun ertaina-handia"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Pasahitza"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Segurtasun handia"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Gailua babesteko eginbideek funtzionatzeari utziko diote."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Administr./Gidalerroak/Kredentz.-biltegiak desgaituta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Bat ere ez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Pasatu hatza"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Kendu desblokeatzeko eredua"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Kendu desblokeatzeko PINa"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Kendu desblokeatzeko pasahitza"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Desaktibatu pantaila blokeatzeko aukera"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Aldatu desblokeatzeko eredua"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Aldatu desblokeo PINa"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Aldatu desblokeatzeko pasahitza"</string>
@@ -555,12 +557,13 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musikarako eta multimedia-edukirako"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Gogoratu ezarpenak"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi laguntzailea"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi laguntzailearen bidez konektatuta"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Igorri pantaila beste gailu batera"</string>
-    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Gaitu hari gabeko bistaratzea."</string>
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Gaitu hari gabeko bistaratzea"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Ez da gailurik aurkitu inguruan."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Konektatzen"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Konektatuta"</string>
-    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Erabiltzen"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Abian"</string>
     <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Ez dago erabilgarri."</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Bistaratze-aukerak"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Hari gabeko pantailaren aukerak"</string>
@@ -569,7 +572,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Izena"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Eman datuak trukatzeko baimena tabletak beste gailu bat ukitzean."</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Onartu datuen trukaketa telefonoak beste gailu bat ukitzen duenean"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Onartu datuen trukea telefonoak beste gailu bat ukitzen duenean"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Aplikazioaren edukia NFC bidez transmititzeko prest"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desaktibatuta"</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi ezarpenak"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Konfiguratu eta kudeatu hari gabeko sarbide-puntuak"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Hautatu Wi‑Fi sarea"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Hautatu Wi-Fi sarea"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi konexioa aktibatzen…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fia desaktibatzen…"</string>
@@ -601,7 +603,7 @@
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Baimendu beti eskaneatzea"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Utzi Google kokapen-zerbitzuei eta beste aplikazioei sareak bilatzen, Wi-Fi konexioa desaktibatuta egon arren"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Erabili Wi‑Fi sare irekiak automatikoki"</string>
-    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Utzi Wi‑Fi laguntzaileari kalitate handiko gisa identifikatutako sare irekietara konektatzen"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Utzi Wi‑Fi laguntzaileari kalitate handiko gisa identifikatutako sare irekietara automatikoki konektatzen"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Aukeratu laguntzailea"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalatu ziurtagiriak"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Kokapenaren zehaztasuna hobetzeko eta beste helburu batzuetarako, Google-k eta beste aplikazio batzuek inguruko sareak bila ditzakete, Wi-Fia desaktibatuta egonda ere. Ez baduzu hori gertatzerik nahi, joan Ezarpen aurreratuak &gt; Bilaketa beti erabilgarri atalera."</string>
@@ -666,7 +668,7 @@
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP ezarpenak"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(aldatu gabea)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(zehaztugabea)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"Gorde egin da"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Gordeta"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desgaituta"</string>
     <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Ezin izan da konfiguratu IP helbidea"</string>
     <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Ezin izan da konektatu Wi-Fi sarera"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"KONTUZ: ez baduzu aktibatzen Wi‑Fi konexioa, tabletak datu mugikorrak soilik erabiliko ditu hasierako deskargak edo eguneratzeak egiteko. Datuengatiko kostuak ekiditeko, konektatu Wi-Fi sare batera."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"KONTUZ: ez baduzu aktibatzen Wi‑Fi konexioa, gailuak datu mugikorrak soilik erabiliko ditu hasierako deskargak edo eguneratzeak egiteko. Datuengatiko kostuak ekiditeko, konektatu Wi-Fi sare batera."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"KONTUZ: ez baduzu aktibatzen Wi‑Fi konexioa, telefonoak datu mugikorrak soilik erabiliko ditu hasierako deskargak edo eguneratzeak egiteko. Datuengatiko kostuak ekiditeko, konektatu Wi-Fi sare batera."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Wi‑Fi sarera konektatzeko urratsa saltatzen baduzu:\n\nTabletak ez du Interneterako konexiorik izango.\n\nEz duzu software-eguneratzerik jasoko Internetera konektatzen zaren arte.\n\nEzin izango dituzu gailuaren babes-eginbideak aktibatu."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Wi‑Fi sarera konektatzeko urratsa saltatzen baduzu:\n\nGailuak ez du Interneterako konexiorik izango.\n\nEz duzu software-eguneratzerik jasoko Internetera konektatzen zaren arte.\n\nEzin izango dituzu gailuaren babes-eginbideak aktibatu."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Wi‑Fi sarera konektatzeko urratsa saltatzen baduzu:\n\nTelefonoak ez du Interneterako konexiorik izango.\n\nEz duzu software-eguneratzerik jasoko Internetera konektatzen zaren arte.\n\nEzin izango dituzu gailuaren babes-eginbideak aktibatu."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Ezin izan da tableta Wi-Fi sare horretara konektatu."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Gailua ezin izan da konektatu Wi‑Fi sare honetara."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Ezin izan da telefonoa Wi‑Fi sarera konektatu."</string>
@@ -815,11 +814,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Doitu pantailaren distira"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Distira doigarria"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizatu pantailaren distira inguruko argitasunaren arabera"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"Inaktibo"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Ezarri egonean moduan"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pantaila itzaltzen da"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Horma-papera"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Aukeratu horma-papera hemendik"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Aukeratu horma-papera"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Pantaila-babeslea"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Oinarrira konektatuta dagoenean edo inaktibo eta kargatzen ari denean"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bietako edozein"</string>
@@ -1013,7 +1012,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tabletaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazio-datuak eta ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Telefonoaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazio-datuak nahiz ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kontu hauetan hasi duzu saioa:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Beste erabiltzaile batzuk ere badaude gailu honetan.\n"</string>
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Badaude erabiltzaile gehiago gailu honetan.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Argazkiak"</li>\n<li>"Bestelako erabiltzaile-datuak"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"USB memoria"</b>" ezabatu behar da."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"SD txartela"</b>" ezabatu behar da."</string>
@@ -1061,7 +1060,7 @@
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Errorea USB bidez konexioa partekatzean"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Konexioa partekatzea (Bluetooth)"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Tabletaren Interneteko konexioa partekatzen"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Telefonoaren Interneteko konexioa partekatzen"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Telefonoaren Interneteko konexioa partekatzen ari da"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Tabletaren Interneteko konexioa gailu batekin partekatzen"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Telefonoaren Interneteko konexioa gailu batekin partekatzen"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Tabletaren Interneteko konexioa <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> gailurekin partekatzen"</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sartu SIM txartela eta berrabiarazi"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Konektatu Internetera"</string>
     <string name="location_title" msgid="1029961368397484576">"Nire kokapena"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Laneko profila"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Laneko profilaren kokapena"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Enpresak desaktibatu du"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modua"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Zehaztasun handia"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Bateria aurreztea"</string>
@@ -1340,8 +1336,8 @@
     <string name="background_process_stop_description" msgid="5034773197139654588">"Aplikazio-prozesu zaharra da hau, baina geroago behar bada erabiltzeko ari da exekutatzen. Normalean ez dago hori gelditzeko arrazoirik."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: erabiltzen ari da. Kontrolatzeko, ukitu Ezarpenak."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"Abian den prozesu nagusia."</string>
-    <string name="process_service_in_use_description" msgid="8993335064403217080">"<xliff:g id="COMP_NAME">%1$s</xliff:g> zerbitzua erabiltzen ari da."</string>
-    <string name="process_provider_in_use_description" msgid="5586603325677678940">"<xliff:g id="COMP_NAME">%1$s</xliff:g> hornitzailea erabiltzen ari da"</string>
+    <string name="process_service_in_use_description" msgid="8993335064403217080">"<xliff:g id="COMP_NAME">%1$s</xliff:g> zerbitzua abian da."</string>
+    <string name="process_provider_in_use_description" msgid="5586603325677678940">"<xliff:g id="COMP_NAME">%1$s</xliff:g> hornitzailea abian da"</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Sistemaren zerbitzua gelditu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Zerbitzua gelditzen baduzu, agian tabletako eginbide batzuk behar bezala funtzionatzeari utziko diote, tableta itzali eta berriro piztu arte."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Zerbitzua gelditzen baduzu, agian telefonoko eginbide batzuk behar bezala funtzionatzeari utziko diote, telefonoa itzali eta berriro piztu arte."</string>
@@ -1606,7 +1602,7 @@
     <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">"Geratzen den denbora: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Kargatu arteko denbora: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> inguru. <xliff:g id="TIME">%2$s</xliff:g> geratzen da"</string>
+    <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> inguru. <xliff:g id="TIME">%2$s</xliff:g> geratzen d(ir)a"</string>
     <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string>
     <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> guztiz kargatu arte"</string>
     <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> korrontearen bidez guztiz kargatu arte"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Sartu aplikazioen datuak"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Leheneratze automatikoa"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Aplikazioak berriro instalatzean, leheneratu babeskopia egindako ezarpenak eta datuak"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Babeskopia-zerbitzua ez dago aktibo."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Gailu-gidalerroak ezartzen du hau."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Tokiko babeskop. pasahitza"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Une honetan, ordenagailuko babeskopia osoak ez daude babestuta."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Ukitu ordenagailuko babeskopia osoak egiteko pasahitza aldatzeko edo kentzeko"</string>
@@ -2008,7 +2002,7 @@
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulatu kolore-espazioa"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Gaitu OpenGL aztarnak"</string>
     <string name="use_awesomeplayer" msgid="1583337008516364226">"Erabili AwesomePlayer (zaharkituta)"</string>
-    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Erabili AwesomePlayer, eta ez NuPlayer, elementu gehienetarako"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Erabili gehienbat AwesomePlayer, eta ez NuPlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Desgaitu USB audio-bideratzea"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Desgaitu USB audio-gailuetara automatikoki bideratzea"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Erakutsi diseinuaren mugak"</string>
@@ -2319,8 +2313,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>. SIM txartela"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM txartela hutsik dago"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM txartelaren izena"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Idatzi SIM txartelaren izena"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"%1$d. SIM zirrikitua"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operadorea"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Zenbakia"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Morea"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Ez dago SIM txartelik sartuta"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIMaren egoera"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIMarekin erlazionatutako informazioa"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Erantzun deiari SIM txartel lehenetsitik"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Irteerako deien SIM txartela"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Deien beste ezarpen batzuk"</string>
@@ -2397,7 +2389,7 @@
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Ez eten"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonoaren tonu-jotzailea"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Jakinarazpenen tonu lehenetsia"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Bibratu deietan ere"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Egin dar-dar deietan ere"</string>
     <string name="notification_section_header" msgid="95661783916799134">"Jakinarazpena"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Jakinarazpen-argi keinukaria"</string>
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Gailua blokeatuta dagoenean"</string>
@@ -2440,7 +2432,7 @@
     <string name="app_notification_block_title" msgid="172237877395761371">"Blokeatu"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ez erakutsi inoiz aplikazio honen jakinarazpenak"</string>
     <string name="app_notification_priority_title" msgid="1967189807102076587">"Lehentasuna"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Erakutsi jakinarazpenak zerrendaren goiko aldean, eta jarraitu jakinarazpenak jasotzen gailuak lehentasunezko etenaldiak bakarrik ezarrita dituenean"</string>
+    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Erakutsi jakinarazpenak zerrendaren goiko aldean, eta jarraitu jakinarazpenak jasotzen gailuak lehentasun-etenaldiak bakarrik ezarrita dituenean"</string>
     <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Isilpekoa"</string>
     <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Gailua blokeatuta dagoenean, ezkutatu aplikazioaren jakinarazpenetako isilpeko edukia"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokeatuta"</string>
@@ -2466,7 +2458,7 @@
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Kontaktuak soilik"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Kontaktu izardunak soilik"</string>
     <string name="zen_mode_events" msgid="2456995649835437565">"Gertaerak eta abisuak"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmak lehentasunezko etenaldiak dira beti"</string>
+    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmak lehentasun-etenaldiak dira beti"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktibatu automatikoki"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Inoiz ez"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Gauero"</string>
@@ -2496,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEIari buruzko informazioa"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEIari buruzko informazioa"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Enkriptatzea"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Jarraitu"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Gailua are gehiago babes dezakezu hasieratu aurretik PIN kodea eskatuta. Gailua hasieratu arte, ezingo duzu jaso deirik, mezurik edo jakinarazpenik, alarmak barne. \n\nHorrela, gailua galdu edo lapurtzekotan, datuak babestuta egongo dira."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a154e9b..e1bfcf1 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"اتصال قطع شود؟"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏این کار اتصال شما را با این دستگاه قطع می‌کند:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"اجازه ندارید تنظیمات بلوتوث را تغییر دهید."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"هنگام باز بودن تنظیمات بلوتوث، <xliff:g id="DEVICE_NAME">%1$s</xliff:g> برای دستگاه‌های اطراف قابل مشاهده است."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"هنگام باز بودن تنظیمات بلوتوث، <xliff:g id="DEVICE_NAME">%1$s</xliff:g> برای دستگاه‌های اطراف قابل مشاهده است."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ارتباط <xliff:g id="DEVICE_NAME">%1$s</xliff:g> قطع شود؟"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"پخش"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"غیر فعال کردن نمایه؟"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"‏مدیریت Wi-Fi، بلوتوث، حالت هواپیما، شبکه‌های تلفن همراه، و VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"داده‌های شبکه تلفن همراه"</string>
     <string name="calls_title" msgid="3544471959217176768">"تماس‌ها"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"پیامک‌ها"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"پیامک‌ها"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"اجازه مصرف داده‌ از طریق شبکه تلفن همراه"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"مصرف داده هنگام رومینگ مجاز است"</string>
     <string name="roaming" msgid="3596055926335478572">"رومینگ داده"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"امنیت متوسط به بالا"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"رمز ورود"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"امنیت بالا"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"قابلیت‌های محافظت دستگاه دیگر کار نمی‌کنند."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"توسط سرپرست، سیاست رمزگذاری یا حافظه اطلاعات کاربردی غیرفعال شده است"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"هیچکدام"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"تند کشیدن"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"حذف الگوی بازگشایی قفل"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"حذف پین بازگشایی قفل"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"حذف رمز ورود بازگشایی قفل"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"برداشتن قفل صفحه"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"تغییر الگوی بازگشایی قفل"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"تغییر پین بازگشایی قفل"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغییر رمز ورود بازگشایی قفل"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"برای موسیقی و رسانه"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"به خاطر سپردن تنظیمات"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"‏متصل شده از طریق دستیار Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"فرستادن صفحه‌نمایش"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"فعال کردن امکان نمایش بی‌سیم"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"هیچ دستگاهی در اطراف پیدا نشد."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"‏تنظیمات Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"تنظیم و مدیریت نقاط دسترسی بی سیم"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"‏انتخاب شبکه Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"‏انتخاب Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"‏روشن کردن Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"‏خاموش کردن Wi-Fi…"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، رایانه لوحی‌تان فقط از داده‌های شبکه تلفن همراه برای دانلودها و به‌روزرسانی‌های اولیه استفاده خواهد کرد. برای اجتناب از هزینه‌های احتمالی داده‌های شبکه تلفن همراه، به Wi‑Fi وصل شوید."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، دستگاهتان فقط از داده‌های شبکه تلفن همراه برای دانلودها و به‌روزرسانی‌های اولیه استفاده خواهد کرد. برای اجتناب از هزینه‌های احتمالی داده‌های شبکه تلفن همراه، به Wi‑Fi وصل شوید."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، تلفنتان فقط از داده‌های شبکه تلفن همراه برای دانلودها و به‌روزرسانی‌های اولیه استفاده خواهد کرد. برای اجتناب از هزینه‌های احتمالی داده‌های شبکه تلفن همراه، به Wi‑Fi وصل شوید."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"‏اگر از Wi-Fi رد شوید:\n\nرایانه لوحیتان اتصال اینترنت نخواهد داشت.\n\nبه‌روزرسانی‌های نرم‌افزار را دریافت نمی‌کنید مگر این که به اینترنت وصل شوید.\n\nویژگی‌های حفاظتی دستگاه را در حال حاضر نمی‌توانید فعال کنید."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"‏اگر از Wi-Fi رد شوید:\n\nدستگاهتان اتصال اینترنت نخواهد داشت.\n\nبه‌روزرسانی‌های نرم‌افزار را دریافت نمی‌کنید مگر این که به اینترنت وصل شوید.\n\nویژگی‌های حفاظتی دستگاه را در حال حاضر نمی‌توانید فعال کنید."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"‏اگر از Wi-Fi رد شوید:\n\nتلفنتان اتصال اینترنت نخواهد داشت.\n\nبه‌روزرسانی‌های نرم‌افزار را دریافت نمی‌کنید مگر این که به اینترنت وصل شوید.\n\nویژگی‌های حفاظتی دستگاه را در حال حاضر نمی‌توانید فعال کنید."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"‏رایانه لوحی قادر به اتصال به این شبکه Wi-Fi نیست."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"‏دستگاه نتوانست به این شبکه Wi‑Fi وصل شود."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"‏تلفن قادر به اتصال به این شبکه Wi-Fi نیست."</string>
@@ -1087,12 +1086,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"نمایه کار"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"محل نمایه کارتان"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"شرکتتان آن را خاموش کرده است"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"حالت"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"دقت زیاد"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"صرفه‌جویی در باتری"</string>
@@ -1440,16 +1436,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"صفحه هرگز در حین شارژ شدن به حالت خواب نمی‌رود"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"‏فعال کردن گزارش تجسس Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"‏ذخیره تمامی بسته‌های HCI بلوتوث در یک فایل"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"باز کردن قفل سازنده تجهیزات اصلی"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"اجازه دهید قفل بوت‌لودر باز شود"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"پین خودتان را وارد کنید"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"پین دستگاهتان را وارد کنید تا بازکردن قفل سازنده محصول اصلی را فعال کنید"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"اجازه می‌هید قفل سازنده تجهیزات اصلی باز شود؟"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"اخطار: وقتی این تنظیم روشن باشد، ویژگی‌های حفاظتی دستگاه در این دستگاه کار نمی‌کند."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"گواهینامه نمایش بدون سیم"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏فعال کردن گزارش‌گیری طولانی Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏Wi‑Fi فعال برای واگذاری به شبکه سلولی"</string>
@@ -1856,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"داده‌های برنامه شامل شود"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"بازیابی خودکار"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"هنگام نصب مجدد برنامه، تنظیمات و داده‌های نسخهٔ پشتیبان بازیابی شود"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"سرویس پشتیبان‌گیری غیرفعال است."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"این مورد توسط خط‌مشی دستگاهتان تنظیم شده است."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"گذرواژه نسخهٔ پشتیبان دسک‌تاپ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"نسخه‌های پشتیبان کامل دسک‌تاپ در حال حاضر محافظت نمی‌شوند"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"برای تغییر یا حذف گذرواژه برای نسخه‌های پشتیبان کامل دسک‌تاپ لمس کنید"</string>
@@ -2011,10 +2001,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"‏همیشه از GPU در ترکیب صفحه استفاده شود"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"شبیه‌سازی فضای رنگ"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"‏فعال کردن ردیابی‌های OpenGL"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"‏استفاده از AwesomePlayer (توصیه نمی‌شود)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"‏برای بازپخش اکثر رسانه‌ها، به‌جای NuPlayer از AwesomePlayer استفاده کنید"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"‏غیرفعال کردن مسیریابی صوتی USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"‏غیرفعال کردن مسیریابی خودکار به وسایل جانبی صوتی USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"نمایش محدوده‌های طرح‌بندی"</string>
@@ -2325,8 +2313,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"نام سیم‌کارت را وارد کنید"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"‏شیار سیم‌کارت %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"شبکه مخابراتی"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"شماره"</string>
@@ -2336,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"بنفش"</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>
@@ -2502,7 +2488,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ماندن در نمای منظره"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ماندن در جهت کنونی"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"‏اطلاعات IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"‏اطلاعات مربوط به IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"رمزگذاری"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ادامه"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"می‌توانید برای محافظت بیشتر از دستگاه، قبل از راه‌اندازی آن، پینتان را درخواست کنید. تا زمانی که دستگاه راه‌اندازی نشود، نمی‌تواند تماس‌ها، پیام‌ها، یا اعلان‌ها را، از جمله زنگ‌های هشدار، دریافت کند. \n\nاین امر به حفاظت از اطلاعات در دستگاه‌های گم‌شده یا دزدیده شده کمک می‌کند."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ee7cfb7..fe9c829 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Katkaistaanko yhteys?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Katkaisee yhteyden laitteeseen:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Sinulla ei ole lupaa muuttaa Bluetooth-asetuksia."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> näkyy lähellä olevissa laitteissa, kun Bluetooth-asetukset on auki."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> näkyy lähellä olevissa laitteissa, kun Bluetooth-asetukset on auki."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Katkaistaanko yhteys laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Lähetys"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Poistetaanko profiili?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Hallinnoi Wi-Fi- ja Bluetooth-yhteyksiä, lentokonetilaa ja mobiili- ja VPN-verkkoja"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobiilitiedonsiirto"</string>
     <string name="calls_title" msgid="3544471959217176768">"Puhelut"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Tekstiviestit"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Tekstiviestit"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Salli tiedonsiirto matkapuh.verkossa"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Salli roaming-tiedonsiirto"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming-tiedonsiirto"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keskitason tai korkea suojaus"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Salasana"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Korkea suojaus"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Laitteen suojausominaisuudet eivät toimi enää."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Ei käytössä (järj.valv/salauskäyt./tunnuks. hall.)"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ei mitään"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Pyyhkäisy"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Poista lukituksenpoistokuvio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Poista lukituksen poistoon käytettävä PIN-koodi"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Poista lukituksen poiston salasana"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Poista ruudun lukitus"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Vaihda lukituksenpoistokuvio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Vaihda lukituksen poiston salasana"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musiikille ja medialle"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Muista asetukset"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Yhteys muodostettu Wi‑Fi-apurin kautta"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Lähetysnäyttö"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ota langaton näyttö käyttöön"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Bluetooth-laitteita ei löydy lähistöltä."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi-asetukset"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ota käyttöön ja hallinnoi langattoman yhteyden tukiasemia"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Valitse Wi‑Fi-verkko"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Valitse Wi-Fi-verkko"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi-yhteyttä otetaan käyttöön…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Poistetaan wifi-yhteyttä käytöstä…"</string>
@@ -600,12 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Haku aina käytettävissä"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Salli verkkojen etsiminen"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Anna Googlen sijaintipalvelun ja muiden sovellusten etsiä verkkoja, vaikka Wi-Fi-yhteys on pois käytöstä"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Käytä avointa Wi‑Fiä automaattisest"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Salli Wi‑Fi-apurin yhdistää automaattisesti korkealaatuisiksi määritettyihin avoimiin verkkoihin"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Valitse apuri"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Asenna varmenteet"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Voit mm. parantaa Googlen ja muiden sovellusten sijaintitietojen tarkkuutta antamalla luvan etsiä wifi-verkkoja myös silloin, kun wifi ei ole käytössä. Jos et halua sallia sitä, valitse Lisäasetukset &gt; Etsiminen aina käytössä."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Sovellukset voivat etsiä läheisiä verkkoja vaikka wifi ei olisi käytössä. Jos et halua sallia sitä, valitse Lisäasetukset &gt; Etsiminen aina käytössä."</string>
@@ -699,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"VAROITUS: jos ohitat Wi‑Fin, tablet-laitteen ensimmäiset lataukset ja päivitykset tehdään mobiilitiedonsiirtoyhteyden kautta. Vältä mahdolliset tiedonsiirtomaksut käyttämällä Wi-Fi-verkkoa."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"VAROITUS: jos ohitat Wi‑Fin, laitteen ensimmäiset lataukset ja päivitykset tehdään mobiilitiedonsiirtoyhteyden kautta. Vältä mahdolliset tiedonsiirtomaksut käyttämällä Wi-Fi-verkkoa."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"VAROITUS: jos ohitat Wi‑Fin, puhelimen ensimmäiset lataukset ja päivitykset tehdään mobiilitiedonsiirtoyhteyden kautta. Vältä mahdolliset tiedonsiirtomaksut käyttämällä Wi-Fi-verkkoa."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Jos et määritä Wi‑Fi-asetuksia:\n\nTabletillasi ei voi muodostaa internetyhteyttä.\n\nEt saa ohjelmistopäivityksiä ennen kuin muodostat internetyhteyden.\n\nEt voi ottaa laitteen suojausominaisuuksia käyttöön tällä hetkellä."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Jos et määritä Wi‑Fi-asetuksia:\n\nLaitteellasi ei voi muodostaa internetyhteyttä.\n\nEt saa ohjelmistopäivityksiä ennen kuin muodostat internetyhteyden.\n\nEt voi ottaa laitteen suojausominaisuuksia käyttöön tällä hetkellä."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Jos et määritä Wi‑Fi-asetuksia:\n\nPuhelimellasi ei voi muodostaa internetyhteyttä.\n\nEt saa ohjelmistopäivityksiä ennen kuin muodostat internetyhteyden.\n\nEt voi ottaa laitteen suojausominaisuuksia käyttöön tällä hetkellä."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet-laite ei voi muodostaa yhteyttä tähän wifi-verkkoon."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Laite ei voinut muodostaa yhteyttä tähän Wi-Fi-verkkoon."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Puhelin ei voi muodostaa yhteyttä tähän wifi-verkkoon."</string>
@@ -836,8 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Herätä nostamalla"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambient-näyttö"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Aktivoi näyttö, kun laite otetaan käteen tai ilmoituksia saapuu"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Kirjasinkoko"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kortin lukitusasetukset"</string>
@@ -1017,8 +1012,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tämä poistaa kaikki tablet-laitteesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tämä poistaa kaikki puhelimesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olet kirjautunut sisään seuraaviin tileihin:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Tällä laitteella on muita paikalla olevia käyttäjiä.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiikki"</li>\n<li>"Valokuvat"</li>\n<li>"Muut käyttäjän tiedot"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"USB-tallennustila"</b>" tulee tyhjentää."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"SD-kortti"</b>" tulee tyhjentää."</string>
@@ -1092,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Aseta SIM-kortti ja käynnistä uudelleen"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Muodosta yhteys internetiin"</string>
     <string name="location_title" msgid="1029961368397484576">"Oma sijainti"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Työprofiili"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Työprofiilin sijainti"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Yritys poisti sijainnin käyt."</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Tila"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Suuri tarkkuus"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Virransäästötila"</string>
@@ -1857,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Sisällytä sovellustiedot"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automaattinen palauttaminen"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Palauta varmuuskopioidut asetukset ja tiedot, kun sovellus asennetaan uudelleen."</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Varmuuskopiopalvelu ei ole käytössä."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Tämä on määritetty laitteen käytännöissä."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Varmuuskop. salasana"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Tietokoneen kaikkien tietojen varmuuskopiointia ei ole tällä hetkellä suojattu."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Muuta tai vaihda tietokoneen kaikkien tietojen varmuuskopioinnin salasana koskettamalla"</string>
@@ -2324,8 +2313,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-kortti <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Tyhjä SIM"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM-kortin nimi"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Anna SIM-kortin nimi"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-korttipaikka %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operaattori"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numero"</string>
@@ -2335,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Violetti"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Laitteessa ei ole SIM-kortteja"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM-kortin tila"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM-korttiin liittyvät tiedot"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Soita takaisin oletus-SIM-kortilla"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Lähtevien puheluiden SIM-kortti"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Muut puheluasetukset"</string>
@@ -2478,12 +2465,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Arki-illat"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Aloitusaika"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Päättymisaika"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> seuraavana päivänä"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> tai hälytyksen yhteydessä"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> seuraavana päivänä tai hälytyksen yhteydessä"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Sovellusilmoitukset"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ilmoitusasetukset"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Lähetä palautetta tästä laitteesta"</string>
@@ -2504,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-koodin tiedot"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-koodiin liittyvät tiedot"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Salaus"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Jatka"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Voit parantaa tämän laitteen suojausta vaatimalla PIN-koodin ennen käynnistystä. Ennen käynnistystä laite ei vastaanota puheluita, viestejä eikä ilmoituksia, mukaan lukien hälytykset. \n\nTämä auttaa suojaamaan kadonneen tai varastetun laitteen sisältämät tiedot."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 7ffd684..a06c65a 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Voulez-vous vraiment vous déconnecter?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Cette opération va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> est visible aux app prox. si param. Bluetooth ouverts"</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Déconnecter <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Désactiver le profil?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gérer le Wi‑Fi, le Bluetooth, le mode Avion, les réseaux cellulaires et les RPV"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Données cellulaires"</string>
     <string name="calls_title" msgid="3544471959217176768">"Appels"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Messages texte"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Autoriser l\'utilisation des données sur le réseau cellulaire"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Autor. util. données en itin."</string>
     <string name="roaming" msgid="3596055926335478572">"Itinérance des données"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Sécurité moyenne à élevée"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mot de passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Sécurité élevée"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Désactivé par admin., règles chiffrement ou stockage des identifiants"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Balayer l\'écran"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Supprimer le schéma de déverrouillage"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Supprimer le NIP de déverrouillage"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Supprimer le mot de passe de déverrouillage"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Modifier le schéma"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Modifier le NIP de déverrouillage"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistant Wi‑Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connecté à l\'aide de l\'assistant Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Écran de diffusion"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activer l\'affichage sans fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Aucun appareil détecté à proximité."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Paramètres Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurer et gérer les points d\'accès sans fil"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Sélectionnez un réseau Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Sélectionner le Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Activation du Wi-Fi en cours…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Désactivation du Wi-Fi en cours…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Recherche toujours disponible"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Toujours autoriser la recherche"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Autoriser le service de localisation de Google et les autres applications à rechercher des réseaux, même si le Wi-Fi est désactivé"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utiliser automatiquement le Wi-Fi ouvert"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Laisser un assistant Wi‑Fi se connecter automatiquement aux réseaux ouverts jugés de bonne qualité"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Sélectionner un assistant"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer les certificats"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pour améliorer la précision, entre autres, le service de localisation de Google et d\'autres applications peuvent rechercher des réseaux Wi-Fi à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Options avancées &gt; Recherche toujours disponible."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les applications peuvent rechercher des réseaux à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Options avancées &gt; Recherche toujours disponible."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre tablette n\'utilisera que les données cellulaires pour les mises à jour et les téléchargements initiaux. Connectez-vous au Wi-Fi afin d\'éviter d\'éventuels frais liés à la consommation de données."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre appareil n\'utilisera que les données cellulaires pour les mises à jour et les téléchargements initiaux. Connectez-vous au Wi-Fi afin d\'éviter d\'éventuels frais liés à la consommation de données."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre téléphone n\'utilisera que les données cellulaires pour les mises à jour et les téléchargements initiaux. Connectez-vous au Wi-Fi afin d\'éviter d\'éventuels frais liés à la consommation de données."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Si vous ignorez le Wi-Fi :\n\nVotre appareil ne sera pas connecté à Internet.\n\nVous ne recevrez pas de mises à jour logicielles jusqu\'à ce que vous vous connectiez à Internet.\n\nVous ne pouvez pas activer les fonctionnalités de protection de l\'appareil en ce moment."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Si vous ignorez le Wi-Fi :\n\nVotre appareil ne sera pas connecté à Internet. \n\nVous ne recevrez pas de mises à jour logicielles jusqu\'à ce que vous vous connectiez à Internet.\n\nVous ne pouvez pas activer les fonctionnalités de protection de l\'appareil en ce moment."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Si vous ignorez le Wi-Fi :\n\nVotre appareil ne sera pas connecté à Internet.\n\nVous ne recevrez pas de mises à jour logicielles jusqu\'à ce que vous vous connectiez à l\'Internet.\n\nVous ne pouvez pas activer les fonctionnalités de protection de l\'appareil en ce moment."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Connexion impossible de la tablette à ce réseau Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Impossible de connecter l\'appareil à ce réseau Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Connexion impossible du téléphone à ce réseau Wi-Fi."</string>
@@ -836,8 +836,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Soulever pour activer"</string>
     <string name="doze_title" msgid="2259176504273878294">"Affichage en mode Veille"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Activer l\'écran lorsque vous prenez l\'appareil ou recevez des notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de police"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Taille de police"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres de verrouillage de la carte SIM"</string>
@@ -1017,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données utilisateur"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"carte SD"</b>"."</string>
@@ -1092,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insérez la carte SIM, puis redémarrez."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connectez-vous à Internet."</string>
     <string name="location_title" msgid="1029961368397484576">"My Location"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profil professionnel"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Position pour profil profess."</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Désactivé par votre entreprise"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Haute précision"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économie de la batterie"</string>
@@ -1445,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"L\'écran ne se met jamais en veille lors du chargement"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activer le journal HCI Snoop Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturer tous les paquets HCI Bluetooth dans un fichier"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Déverrouillage par le fabricant"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Autoriser le déverrouillage du fichier d\'amorce"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Entrez votre NIP"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Entrez votre NIP d\'appareil pour activer le déverrouillage OEM"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Permettre le déverrouillage par le fabricant?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVERTISSEMENT : Les fonctions de protection de l\'appareil ne fonctionneront pas sur cet appareil lorsque ce paramètre est activé."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification de l\'affichage sans fil"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Autoriser enreg. données Wi-Fi détaillées"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Passage forcé du Wi-Fi aux données cellulaires"</string>
@@ -1618,7 +1609,7 @@
     <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> %% – Temps restant : environ <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string>
     <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> %% (chargée à 100 %% dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
-    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> %% (chargée à 100 %% sur prise de courant dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> %% (charge complète sur c.a. dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
     <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> %% (chargée à 100 %% par USB dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
     <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> %% (chargée à 100 %% avec chargeur sans fil dans <xliff:g id="TIME">%2$s</xliff:g>)"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Usage depuis la dernière charge complète"</string>
@@ -1861,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inclure données applications"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauration automatique"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Lors de la réinstallation d\'une application, restaurer les paramètres et les données sauvegardées"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Le service de sauvegarde est inactif."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Cela est défini par la politique de votre appareil."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Mot de passe sauvegarde PC"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Les sauvegardes complètes sur PC ne sont pas protégées actuellement."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Appuyez pour modifier ou supprimer le mot de passe utilisé pour les sauvegardes complètes sur PC."</string>
@@ -2016,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Toujours utiliser le GPU pour la composition écran"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simuler esp. colorimétrique"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Enable OpenGL traces"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Util. AwesomePlayer (obs.)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Util. AwesomePlayer au lieu de NuPlayer pr lect. média"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Désact. routage audio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Désactiver routage automatique appareils audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Afficher les contours"</string>
@@ -2330,8 +2317,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"Carte SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"La fente pour carte SIM est vide"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nom de la carte SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Entrez le nom de la carte SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Fente pour carte SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Fournisseur de services"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numéro"</string>
@@ -2341,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Mauve"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Aucune carte SIM insérée"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"État de la carte SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Reenseignements concernant la carte SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Rappeler avec la carte SIM par défaut"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Carte SIM pour les appels sortants"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Autres paramètres d\'appel"</string>
@@ -2484,12 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Les soirs de semaine"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Heure de début"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Heure de fin"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ou toute alarme avant"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain ou toute alarme avant"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. application"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Commentaires sur cet appareil"</string>
@@ -2510,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Information concernant le code IIEM"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Information concernant le code IIEM"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Chiffrement"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuer"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Pour améliorer la protection de cet appareil, vous pouvez exiger l\'entrée du NIP avant le démarrage. L\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a75e6a0..d3e3896 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Déconnecter ?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Cela va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" est visible par les appareils à proximité avec le Bluetooth activé."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Déconnecter l\'appareil \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Désactiver le profil ?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gérer le Wi‑Fi, le Bluetooth, le mode Avion, les réseaux mobiles et les VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Données mobiles"</string>
     <string name="calls_title" msgid="3544471959217176768">"Appels"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Autoriser conso données sur réseau mobile"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Autor. conso données en itinér."</string>
     <string name="roaming" msgid="3596055926335478572">"Itinérance des données"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Sécurité moyenne à élevée"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mot de passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Sécurité élevée"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Désactivé par admin., règles chiffrement ou stockage des identifiants"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Balayer l\'écran"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Supprimer le schéma de déverrouillage"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Supprimer le code PIN de déverrouillage"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Supprimer le mot de passe de déverrouillage"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Modifier le schéma de déverrouillage"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Modifier le code PIN de déverrouillage"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistant Wi‑Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connecté via l\'assistant Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Caster l\'écran"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activer l\'affichage sans fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Aucun appareil détecté à proximité."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Paramètres Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurer et gérer les points d\'accès sans fil"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Sélectionner un réseau Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Sélectionner le Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Activation du Wi-Fi en cours…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Désactivation du Wi-Fi en cours…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Recherche toujours disponible"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Toujours autoriser la recherche"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Autoriser le service de localisation de Google et les autres applications à rechercher des réseaux, même si le Wi-Fi est désactivé"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Utiliser automatiquement le Wi-Fi ouvert"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Laisser un assistant Wi‑Fi se connecter automatiquement aux réseaux ouverts jugés de bonne qualité"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Sélectionner un assistant"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer les certificats"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pour améliorer la précision et à d\'autres fins, le service de localisation de Google et d\'autres applications peuvent rechercher des réseaux Wi-Fi à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Options avancées &gt; Recherche toujours disponible."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les applications peuvent rechercher des réseaux à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Avancé &gt; Recherche toujours disponible."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre tablette n\'utilisera que les données mobiles pour les mises à jour et les téléchargements initiaux. Connectez-vous au Wi-Fi afin d\'éviter d\'éventuels frais liés à la consommation de données."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre appareil n\'utilisera que les données mobiles pour les mises à jour et les téléchargements initiaux. Connectez-vous au Wi-Fi afin d\'éviter d\'éventuels frais liés à la consommation de données."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AVERTISSEMENT : Si vous ne configurez pas le Wi-Fi, votre téléphone n\'utilisera que les données mobiles pour les mises à jour et les téléchargements initiaux. Connectez-vous au Wi-Fi afin d\'éviter d\'éventuels frais liés à la consommation de données."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Si vous ignorez l\'étape de configuration de la connexion Wi‑Fi :\n\nVotre tablette n\'aura pas accès à Internet.\n\nVous ne pourrez pas obtenir les mises à jour des logiciels tant que vous ne vous connecterez pas à Internet.\n\nVous ne pourrez pas activer les fonctionnalités de protection de l\'appareil dans l\'immédiat."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Si vous ignorez l\'étape de configuration de la connexion Wi‑Fi :\n\nVotre appareil n\'aura pas accès à Internet.\n\nVous ne pourrez pas obtenir les mises à jour des logiciels tant que vous ne vous connecterez pas à Internet.\n\nVous ne pourrez pas activer les fonctionnalités de protection de l\'appareil dans l\'immédiat."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Si vous ignorez l\'étape de configuration de la connexion Wi‑Fi :\n\nVotre téléphone n\'aura pas accès à Internet.\n\nVous ne pourrez pas obtenir les mises à jour des logiciels tant que vous ne vous connecterez pas à Internet.\n\nVous ne pourrez pas activer les fonctionnalités de protection de l\'appareil dans l\'immédiat."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Connexion impossible de la tablette à ce réseau Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Impossible de connecter l\'appareil à ce réseau Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Connexion impossible du téléphone à ce réseau Wi-Fi."</string>
@@ -836,8 +836,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Soulever pour activer"</string>
     <string name="doze_title" msgid="2259176504273878294">"Affichage en mode Veille"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Activer l\'écran lors de la prise en main de l\'appareil ou de la réception de notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de la police"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Taille de police"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres verrouillage SIM"</string>
@@ -1017,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données utilisateur"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"carte SD"</b>"."</string>
@@ -1092,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insérez la carte SIM, puis redémarrez."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connectez-vous à Internet."</string>
     <string name="location_title" msgid="1029961368397484576">"Ma position"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profil professionnel"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Emplacement du profil pro"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Désactivé par votre entreprise"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Haute précision"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économie de batterie"</string>
@@ -1445,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"L\'écran ne se met jamais en veille lors du chargement."</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activer journaux HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Enregistrer tous les paquets HCI Bluetooth dans un fichier"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Déverrouillage OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Autoriser le déverrouillage du chargeur d\'amorçage"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Saisissez votre code d\'accès."</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Saisir le code d\'accès de l\'appareil pour activer le déverrouillage OEM"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Autoriser le déverrouillage OEM ?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVERTISSEMENT : Les fonctionnalités de protection de l\'appareil sont désactivées tant que ce paramètre est activé."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification de l\'affichage sans fil"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Autoriser enreg. infos Wi-Fi détaillées"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Passage forcé du Wi-Fi aux données mobiles"</string>
@@ -1861,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inclure données application"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restaurer automatiquement"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Lors de la réinstallation d\'une application, restaurer les paramètres et les données sauvegardées"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Le service de sauvegarde n\'est pas activé."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Cette préférence est définie par les règles de votre appareil."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Mot de passe sauvegarde PC"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Les sauvegardes complètes sur PC ne sont pas protégées actuellement."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Appuyez pour modifier ou supprimer le mot de passe utilisé pour les sauvegardes complètes sur PC."</string>
@@ -2016,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Toujours utiliser le GPU pour la composition écran"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simuler espace colori."</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activer les traces OpenGL"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Utiliser AwesomePlayer (obsolète)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Utiliser AwesomePlayer au lieu de NuPlayer pour la lecture de la plupart des contenus médias"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Désact. routage audio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Désactiver routage auto vers périph. audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Afficher les contours"</string>
@@ -2330,8 +2317,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"Carte SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Carte SIM vide"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nom de la carte SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Saisir le nom de la carte SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Emplacement pour carte SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Opérateur"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numéro"</string>
@@ -2341,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Violet"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Aucune carte SIM insérée."</string>
     <string name="sim_status_title" msgid="6744870675182447160">"État de la carte SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informations relatives à la carte SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Rappeler depuis la carte SIM par défaut"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Carte SIM pour appels sortants"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Autres paramètres d\'appel"</string>
@@ -2484,12 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Les soirs de semaine"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Heure de début"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Heure de fin"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ou toute alarme définie avant cette heure"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain ou toute alarme définie avant cette heure"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifications appli."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envoyer commentaires sur appareil"</string>
@@ -2510,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Informations sur le code IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informations relatives au code IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Chiffrement"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuer"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Pour améliorer la protection de cet appareil, vous pouvez exiger la saisie du code PIN avant le démarrage. Dans ce cas, l\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil."</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index c1e9159..5c76c4c 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desconectar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isto finalizará a túa conexión con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Non tes permiso para cambiar a configuración de Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> visible para disp próximos con axus BT abertos."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será visible para dispositivos próximos coa configuración de Bluetooth activada."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Queres desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Difusión"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desactivar o perfil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Xestiona a wifi, o Bluetooth, o modo avión, redes de telefonía móbil e VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Datos móbiles"</string>
     <string name="calls_title" msgid="3544471959217176768">"Chamadas"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mensaxes SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Mensaxes SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Permitir o uso de datos na rede móbil"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Permitir datos en itinerancia"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerancia de datos"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Seguridade de media a alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contrasinal"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Alta seguridade"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"As funcións de protección do dispositivo deixarán de funcionar."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivado por admin, política encriptación ou almacenamento credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ningunha"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Pasar o dedo"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Elimina o padrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Elimina o PIN de desbloqueo"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Elimina o contrasinal de desbloqueo"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Eliminar bloqueo da pantalla"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrón desbloq."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN desbloq."</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mudar contrasinal desbloq."</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e contido multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configuración"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistente de wifi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conectado ao asistente de wifi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Enviar pantalla"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activar visualización sen fíos"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Non hai dispositivos cerca."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Configuración da wifi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wifi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configura e xestiona puntos de acceso sen fíos"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Seleccionar rede wifi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Seleccionar wifi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Activando a wifi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Desactivando a wifi..."</string>
@@ -604,8 +606,8 @@
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permitir ao asistente wifi conectarse automaticamente a redes abertas de alta calidade"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Seleccionar asistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mellorar a precisión da localización e para outros fins, é posible que Google e outras aplicacións busquen redes próximas, aínda que a wifi estea desactivada. Se non queres que isto pase, vai a Avanzado &gt; Exploración sempre dispoñible."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"É posible que as aplicacións busquen redes próximas, aínda que a wifi estea desactivada. Se non queres que isto pase, vai a Avanzado &gt; Exploración sempre dispoñible."</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mellorar a precisión da localización e para outros fins, é posible que Google e outras aplicacións busquen redes próximas, aínda que a wifi estea desactivada. Se non queres que isto pase, accede a Avanzado &gt; Buscar redes sempre."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"É posible que as aplicacións busquen redes próximas, aínda que a wifi estea desactivada. Se non queres que isto pase, accede a Avanzado &gt; Buscar redes sempre."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Non mostrar outra vez"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter a wifi activada durante o modo de suspensión"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wifi activada na suspensión"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ADVERTENCIA: Se omites a conexión wifi, o tablet só utilizará datos móbiles para facer descargas e actualizacións iniciais. Para evitar posibles cargos de datos, conéctate a unha rede wifi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ADVERTENCIA: Se omites a conexión wifi, o dispositivo só utilizará datos móbiles para facer descargas e actualizacións iniciais. Para evitar posibles cargos de datos, conéctate a unha rede wifi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ADVERTENCIA: Se omites a conexión wifi, o teléfono só utilizará datos móbiles para facer descargas e actualizacións iniciais. Para evitar posibles cargos de datos, conéctate a unha rede wifi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Se omites a conexión wifi:\n\nO teu tablet non se poderá conectar a Internet.\n\nNon recibirás actualizacións de software ata que te conectes a Internet.\n\nNon podes activar as funcións de protección do dispositivo neste momento."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Se omites a conexión wifi:\n\nO teu dispositivo non se poderá conectar a Internet.\n\nNon recibirás actualizacións de software ata que te conectes a Internet.\n\nNon podes activar as funcións de protección do dispositivo neste momento."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Se omites a conexión wifi:\n\nO teu teléfono non se poderá conectar a Internet.\n\nNon recibirás actualizacións de software ata que te conectes a Internet.\n\nNon podes activar as funcións de protección do dispositivo neste momento."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"O tablet non puido conectarse a esta rede wifi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"O dispositivo non foi capaz de conectarse a esta rede wifi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"O teléfono non foi capaz de conectarse a esta rede wifi."</string>
@@ -833,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para acender"</string>
     <string name="doze_title" msgid="2259176504273878294">"Pantalla ambiente"</string>
-    <string name="doze_summary" msgid="7128970177894383698">"Activar a pantalla ao coller o dispositivo ou recibir notificacións"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Activar pantalla ao coller o dispositivo ou recibir notificacións"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño do tipo de letra"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño do tipo de letra"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo da tarxeta SIM"</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Introduce unha tarxeta SIM e reinicia"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conéctate a Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"A miña localización"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Perfil de traballo"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Localización perfil traballo"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Desactivado pola túa empresa"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisión"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Aforro de batería"</string>
@@ -1245,7 +1241,7 @@
     <string name="disabled" msgid="9206776641295849915">"Desactivada"</string>
     <string name="not_installed" msgid="2797554494953450291">"Sen instalar para este usuario"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ningunha aplicación."</string>
-    <string name="internal_storage" msgid="1584700623164275282">"Almac. interno"</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Almacenamento interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Almac. USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Tarxeta SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Recalculando o tamaño…"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluír datos de aplicacións"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Cando volvas instalar unha aplicación, restaura a configuración e os datos dos que fixeches unha copia de seguranza"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"O servizo de copias de seguranza está inactivo."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Establécese mediante a política do dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contrasinal para copias"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"As copias de seguridade de ordenador completas non están protexidas"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toca para cambiar ou eliminar o contrasinal para as copias de seguranza completas do escritorio"</string>
@@ -2054,7 +2048,7 @@
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronización automática de datos"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"Tarxetas SIM"</string>
     <string name="data_usage_menu_cellular_networks" msgid="5243515735055652279">"Redes móbiles"</string>
-    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Sincronización de datos auto."</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Sincronización automática"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Sincr. auto. de datos persoais"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Sincr. auto. datos do traballo"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Cambiar ciclo…"</string>
@@ -2209,7 +2203,7 @@
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Só o propietario do teléfono pode xestionar usuarios."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Os perfís restrinxidos non poden engadir contas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eliminar <xliff:g id="USER_NAME">%1$s</xliff:g> do dispositivo"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"Engadir us. co disp. bloqueado"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"Engade usuarios co disp. bloq."</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novo usuario"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novo perfil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Queres eliminarte a ti mesmo?"</string>
@@ -2319,8 +2313,7 @@
     <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 baleira"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nome da SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Introducir o nome da SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Rañura da SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operador"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Violeta"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Non hai ningunha tarxeta SIM inserida"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Estado da SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Información relacionada coa SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Devolver chamada da SIM predeterminada"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Tarxeta SIM para chamadas saíntes"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Outras configuracións de chamada"</string>
@@ -2473,9 +2465,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noites pola semana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de inicio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalización"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do día seguinte"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ou calquera alarma antes"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do día seguinte ou calquera alarma antes"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Ás <xliff:g id="FORMATTED_TIME">%s</xliff:g> do día seguinte"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"Ás <xliff:g id="FORMATTED_TIME">%s</xliff:g> ou con calquera alarma anterior"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Ás <xliff:g id="FORMATTED_TIME">%s</xliff:g> do día seguinte ou con calquera alarma anterior"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notific. aplicacións"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración das notificacións"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentarios do dispositivo"</string>
@@ -2483,7 +2475,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desactivado"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fixar pantalla"</string>
-    <string name="screen_pinning_description" msgid="1137904524037468263">"Se activas esta configuración, podes fixar a pantalla para manter visible a pantalla actual ata que non anules a fixación.\n\nFai o seguinte:\n\n1. Asegúrate de que a fixación de pantalla está activada.\n\n2. Abre a pantalla que queres fixar.\n\n3. Toca Visión xeral.\n\n4. Pasa o dedo cara arriba e toca a icona de fixación."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Se esta opción está activada, podes fixar a pantalla para manter visible a pantalla actual ata que non anules a fixación.\n\nFai o seguinte:\n\n1. Asegúrate de que a fixación de pantalla está activada.\n\n2. Abre a pantalla que queres fixar.\n\n3. Toca Visión xeral.\n\n4. Pasa o dedo cara arriba e toca a icona de fixación."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Solicitar un padrón de desbloqueo antes de soltar a pantalla"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Solicitar un PIN antes de soltar a pantalla"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Solicitar un contrasinal antes de soltar a pantalla"</string>
@@ -2496,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Información de IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Información relativa de IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Cifrado"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Podes protexer aínda máis este dispositivo requirindo o teu PIN antes de inicialo. Ata que o dispositivo se inicie, non poderá recibir chamadas, mensaxes nin notificacións, incluídas as alarmas. \n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b161740..a302720 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"डिस्‍कनेक्‍ट करें?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"इससे &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; के साथ आपका कनेक्‍शन समाप्त हो जाएगा"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"आपको ब्लूटूथ सेटिंग में बदलाव करने की अनुमति नहीं है."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ब्लूटूथ सेटिंग खुली हो तो <xliff:g id="DEVICE_NAME">%1$s</xliff:g> पास के डिवाइस में दिखता है."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को डिस्कनेक्ट करें?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"प्रोफ़ाइल अक्षम करें?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"वाई-फ़ाई, ब्लूटूथ, हवाई जहाज़ मोड, सेल्युलर नेटवर्क और VPN प्रबंधित करें"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"सेल्युलर डेटा"</string>
     <string name="calls_title" msgid="3544471959217176768">"कॉल"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS संदेश"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"सेल्युलर नेटवर्क पर डेटा उपयोग करने दें"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"रोमिंग में डेटा उपयोग करने दें"</string>
     <string name="roaming" msgid="3596055926335478572">"डेटा रोमिंग"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"व्यवस्‍थापक, एन्‍क्रिप्शन नीति, या प्रमाणिकता मेमोरी द्वारा अक्षम किया गया"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"कोई नहीं"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"स्वाइप करें"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"अनलॉक आकार निकालें"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"अनलॉक पिन निकालें"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"अनलॉक पासवर्ड निकालें"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलॉक आकार बदलें"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदलें"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"अनलॉक पासवर्ड बदलें"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत और मीडिया के लिए"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग याद रखें"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"वाई-फ़ाई सहायक"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"वाई-फ़ाई सहायक के द्वारा कनेक्‍ट है"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"स्क्रीन कास्ट करें"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस डिस्प्ले सक्षम करें"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"आस-पास कोई भी डिवाइस नहीं मिला."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"वाई-फ़ाई सेटिंग"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"वाई-फ़ाई"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"वायरलेस पहुंच बिंदुओं को सेट अप और प्रबंधित करें"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"वाई-फ़ाई नेटवर्क चुनें"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"वाई-फ़ाई चुनें"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"वाई-फ़ाई  चालू हो रहा है…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"वाई-फ़ाई  बंद हो रहा है…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"स्कैनिंग हमेशा उपलब्ध है"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"हमेशा स्कैन करने दें"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google की स्थान सेवा और अन्य ऐप्स को नेटवर्क स्कैन करने दें, भले ही वाई-फ़ाई बंद हो"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"खुले वाई-फ़ाई का अपने आप उपयोग करें"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"उच्‍च गुणवत्‍ता वाले के रूप में पहचाने गए खुले नेटवर्क से वाई-फ़ाई सहायक को अपने आप कनेक्‍ट होने दें"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"सहायक चुनें"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्र इंस्टाल करें"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"स्थान सटीकता को बेहतर बनाने तथा अन्य प्रयोजनों के लिए, Google और अन्य ऐप्स  आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही वाई-फ़ाई  बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"ऐप्स  आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही वाई-फ़ाई  बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"चेतावनी: यदि आप वाई-फ़ाई को छोड़ते हैं, तो आपका टेबलेट आरंभिक डाउनलोड और नई जानकारी के लिए केवल सेल्युलर डेटा का उपयोग करेगा. संभावित डेटा शुल्क से बचने के लिए, वाई-फ़ाई से कनेक्ट करें."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"चेतावनी: यदि आप वाई-फ़ाई को छोड़ते हैं, तो आपका डिवाइस आरंभिक डाउनलोड और अपडेट के लिए केवल सेल्युलर डेटा का उपयोग करेगा. संभावित डेटा शुल्क से बचने के लिए, वाई-फ़ाई से कनेक्ट करें."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"चेतावनी: यदि आप वाई-फ़ाई को छोड़ते हैं, तो आपका फ़ोन आरंभिक डाउनलोड और अपडेट के लिए केवल सेल्युलर डेटा का उपयोग करेगा. संभावित डेटा शुल्क से बचने के लिए, वाई-फ़ाई से कनेक्ट करें."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"यदि आप वाई-फ़ाई को छोड़ते हैं:\n\nतो आपके टैबलेट में इंटरनेट कनेक्‍शन नहीं होगा.\n\nआपको सॉफ़्टवेयर अपडेट तब तक नहीं मिलेंगे जब तक कि आप इंटरनेट से कनेक्‍ट नहीं करते.\n\nआप इस समय डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं कर सकते हैं."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"यदि आप वाई-फ़ाई को छोड़ते हैं:\n\nतो आपके डिवाइस में इंटरनेट कनेक्‍शन नहीं होगा.\n\nआपको सॉफ़्टवेयर अपडेट तब तक नहीं मिलेंगे जब तक कि आप इंटरनेट से कनेक्‍ट नहीं करते.\n\nआप डिवाइस सुरक्षा सुविधाओं को इस समय सक्रिय नहीं कर सकते हैं."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"यदि आप वाई-फ़ाई को छोड़ते हैंI:\n\nतो आपके फ़ोन में इंटरनेट कनेक्‍शन नहीं होगा.\n\nआपको सॉफ़्टवेयर अपडेट तब तक नहीं मिलेंगे जब तक कि आप इंटरनेट से कनेक्‍ट नहीं करते.\n\nआप डिवाइस सुरक्षा सुविधाओं को इस समय सक्रिय नहीं कर सकते हैं."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"टेबलेट इस वाई-फ़ाई  नेटवर्क से कनेक्ट नहीं हो सका था."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"डिवाइस इस वाई-फ़ाई नेटवर्क से कनेक्ट नहीं हो सका."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"फ़ोन इस वाई-फ़ाई  नेटवर्क से कनेक्ट नहीं हो सका था."</string>
@@ -1016,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"इससे आपके टेबलेट के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"इससे आपके फ़ोन के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आप वर्तमान में निम्‍न खातों में प्रवेश हैं:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"इस डिवाइस पर अन्‍य उपयोगकर्ता मौजूद हैं.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"फ़ोटो"</li>\n<li>"अन्‍य उपयोगकर्ता डेटा"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"संगीत, चित्र और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>" USB मेमोरी"</b>" मिटाना होगा."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"संगीत, चित्र और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>"SD कार्ड"</b>" को साफ़ करना होगा."</string>
@@ -1091,12 +1090,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"कार्य प्रोफ़ाइल"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"कार्य प्रोफ़ाइल का स्‍थान"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"आपकी कंपनी ने बंद किया है"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"मोड"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च सटीकता"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"बैटरी की बचत"</string>
@@ -1444,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"चार्ज होने के दौरान स्‍क्रीन कभी निष्‍क्रिय नहीं होगी"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ब्लूटूथ HCI स्‍नूप लॉग सक्षम करें"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"फ़ाइल के सभी ब्लूटूथ HCI पैकेट कैप्‍चर करें"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM अनलॉक करना"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"बूटलोडर को अनलाॅक किए जाने की अनुमति दें"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"अपना पिन डालें"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM अनलॉक सक्षम करने के लिए अपना डिवाइस पिन डालें"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM अनलॉक करने की अनुमति दें?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"चेतावनी: इस सेटिंग के चालू रहने पर डिवाइस सुरक्षा सुविधाएं इस डिवाइस पर काम नहीं करेंगी."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"वायरलेस दिखाई देने के लिए प्रमाणन"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"वाई-फ़ाई वर्बोस प्रवेश सक्षम करें"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"वाई-फ़ाई से सेल्यूलर पर बलपूर्वक हस्तांतरण"</string>
@@ -1860,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"ऐप्स डेटा शामिल करें"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"अपने आप डेटा रिस्टोर करें"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"किसी ऐप्स को पुन: इंस्‍टॉल करने पर, बैकअप ली गई सेटिंग और डेटा पुनर्स्‍थापित करें"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"बैकअप सेवा निष्‍क्रिय है."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"इसे आपकी डिवाइस नीति द्वारा सेट किया गया है."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्‍कटॉप बैकअप पासवर्ड"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्‍कटॉप पूर्ण बैकअप वर्तमान में सुरक्षित नहीं हैं"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"डेस्कटॉप के पूर्ण बैकअप के पासवर्ड को बदलने या निकालने के लिए स्‍पर्श करें."</string>
@@ -2015,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"स्‍क्रीन संयोजन के लिए हमेशा GPU का उपयोग करें"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"रंग स्पेस सिम्युलेट करें"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL चिह्न सक्षम करें"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer चलाएं (बहिष्‍कृत)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"अधिकांश मीडिया प्‍लेबैक हेतु NuPlayer के बजाय AwesomePlayer पे चलाएं"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ऑडियो रूटिंग अक्षम करें"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ऑडियो पेरिफ़ेरल पर स्‍वत: रूटिंग अक्षम करें"</string>
     <string name="debug_layout" msgid="5981361776594526155">"लेआउट सीमाएं दिखाएं"</string>
@@ -2329,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"सिम का नाम डालें"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"सिम स्‍लॉट %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"वाहक"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"नंबर"</string>
@@ -2340,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"बैंगनी"</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>
@@ -2506,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"भू-दृश्य में बने रहें"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिविन्यास में बने रहें"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI जानकारी"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI संबंधी जानकारी"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"एैन्‍क्रिप्‍शन"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"जारी रखें"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"आप अपने डिवाइस के प्रारंभ होने से पहले अपना पिन डालना आवश्‍यक बनाकर उसे अधिक सुरक्षित बना सकते हैं. जब तक डिवाइस प्रारंभ नहीं हो जाता, वह अलार्म सहित कॉल, संदेश या नोटिफिकेशन प्राप्‍त नहीं कर सकता. \n\nइससे गुम हुए या चोरी गए डिवाइस पर डेटा की सुरक्षा करने में सहायता मिलती है."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 715782a..9ffb197 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Isključiti?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"To će prekinuti vašu vezu s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nemate dopuštenje za promjenu postavki Bluetootha."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vidljiv je obliž. uređ. dok su pos. Bluetoo. otv."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Želite li prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emitiranje"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Onemogućiti profil?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Upravljanje Wi-Fi-jem, Bluetoothom, načinom rada u zrakoplovu, mobilnim mrežama i VPN-ovima"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobilni podaci"</string>
     <string name="calls_title" msgid="3544471959217176768">"Pozivi"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS poruke"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Dopusti mobilni prijenos podataka"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Podatkovni promet u roamingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming podataka"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Srednja do visoka sigurnost"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Zaporka"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Visoka sigurnost"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onemogućili administrator, pravila enkripcije ili pohrana vjerodajnica"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Prelazak prstom"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ukloni uzorak za otključavanje"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ukloni otključavanje PIN-a"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Ukloni zaporku za zaključavanje"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Izmijeni uzorak za otključavanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Promijeni PIN za otključavanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promijeni zaporku za otključavanje"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glazbu i medije"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamti postavke"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Povezani putem pomoćnika za Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Emitirani zaslon"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogući bežični prikaz"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"U blizini nema uređaja."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Postavke Wi-Fi-ja"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Postavljanje i upravljanje bežičnim pristupnim točkama"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Odabir Wi-Fi mreže"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Odaberite Wi‑Fi mrežu"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Uključivanje Wi-Fi-ja…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Isključivanje Wi-Fi-ja…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Traženje je uvijek dostupno"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Uvijek omogući pretraživanje"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Neka Googleova usluga lokacije i druge aplikacije traže mreže, čak i kada je Wi-Fi isključen"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automatski upotrebljavaj otvoreni Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Dopusti pomoćniku za Wi‑Fi automatsko povezivanje s otvorenim mrežama s utvrđenom visokom kvalitetom"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Odaberite pomoćnik"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaliranje certifikata"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Radi poboljšavanja preciznosti i u neke druge svrhe Google i ostale aplikacije mogu tražiti mreže u blizini, čak i kada je Wi-Fi isključen. Ako ne želite da se to događa, idite na opcije Napredno &gt; Traženje je uvijek dostupno."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacije mogu tražiti mreže u blizini, čak i kada je Wi-Fi isključen. Ako ne želite da se to događa, idite na opcije Napredno &gt; Traženje je uvijek dostupno."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"UPOZORENJE: ako preskočite Wi‑Fi, tablet će upotrebljavati samo mobilne podatke za početna preuzimanja i ažuriranja. Da biste izbjegli moguće troškove za prijenos podataka, povežite se s Wi-Fi-jem."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"UPOZORENJE: ako preskočite Wi‑Fi, uređaj će upotrebljavati samo mobilne podatke za početna preuzimanja i ažuriranja. Da biste izbjegli moguće troškove za prijenos podataka, povežite se s Wi-Fi-jem."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"UPOZORENJE: ako preskočite Wi‑Fi, telefon će upotrebljavati samo mobilne podatke za početna preuzimanja i ažuriranja. Da biste izbjegli moguće troškove za prijenos podataka, povežite se s Wi-Fi-jem."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ako preskočite Wi‑Fi:\n\ntablet neće imati internetsku vezu.\n\nNećete primati ažuriranja softvera dok se ne povežete s internetom.\n\nNe možete aktivirati značajke zaštite uređaja u ovom trenutku."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ako preskočite Wi‑Fi:\n\nuređaj neće imati internetsku vezu.\n\nNećete primati ažuriranja softvera dok se ne povežete s internetom.\n\nNe možete aktivirati značajke zaštite uređaja u ovom trenutku."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ako preskočite Wi‑Fi:\n\ntelefon neće imati internetsku vezu.\n\nNećete primati ažuriranja softvera dok se ne povežete s internetom.\n\nNe možete aktivirati značajke zaštite uređaja u ovom trenutku."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tabletno računalo nije se moglo povezati s ovom Wi-Fi mrežom."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Uređaj se nije mogao povezati s tom Wi‑Fi mrežom."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon se nije mogao povezati s ovom Wi-Fi mrežom."</string>
@@ -1016,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" tabletnog računala, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutačno ste prijavljeni na sljedeće račune:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Na ovom uređaju postoje i drugi korisnici.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glazba"</li>\n<li>"Fotografije"</li>\n<li>"Ostali korisnički podaci"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"SD karticu"</b>"."</string>
@@ -1091,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Umetnite SIM karticu i pokrenite ponovo"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Povežite se s internetom"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Radni profil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokacija za radni profil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Isključila ju je vaša tvrtka"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Način"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka preciznost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Štednja baterije"</string>
@@ -1444,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Zaslon nikad neće prijeći u mirovanje tijekom punjenja"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Omogući zapisnik naredbe \"snoop\" za Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Snimi sve Bluetooth HCI pakete u datoteci"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM otključavanje"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Neka kôd za pokretanje sustava bude otključan"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Unesite PIN"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Unesite PIN uređaja da biste omogućili OEM otključavanje"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Želite li dopustiti OEM otključavanje?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORENJE: značajke za zaštitu uređaja neće funkcionirati na ovom uređaju dok je ta postavka uključena."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikacija bežičnog prikaza"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Omogući opširnu prijavu na Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aktivni prijelaz s Wi‑Fi na mob. mrežu"</string>
@@ -1860,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Uključi podatke aplikacija"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatska obnova"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri ponovnoj instalaciji aplikacije vratiti postavke i podatke za koje su stvorene sigurnosne kopije"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Usluga sigurnosnog kopiranja nije aktivna."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"To je postavljeno pravilom uređaja."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Zaporka sigurnosne kopije"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Potpune sigurnosne kopije na stolnom računalu trenutačno nisu zaštićene"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Odaberite za promjenu ili uklanjanje zaporke u potpunim sigurnosnim kopijama na stolnom računalu"</string>
@@ -2015,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Uvijek upotrijebi GPU kod slaganja zaslona"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simuliraj prostor boja"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogući OpenGL praćenja"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Upotrijebi AwesomePlayer (obustavljeno)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Upotrijebi AwesomePlayer umjesto NuPlayera za reprodukciju većine medija"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Onemogući USB audiousmj."</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Onemogući aut. usmjeravanje na USB audioperiferiju"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Prikaži granice izgleda"</string>
@@ -2329,8 +2317,7 @@
     <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 je prazan"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Naziv SIM-a"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Unesite naziv SIM-a"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Utor za SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Mobilni operater"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Broj"</string>
@@ -2340,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Ljubičasta"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM kartica nije umetnuta"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status SIM-a"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informacije povezane sa SIM-om"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Uzvratni poziv sa zadanog SIM-a"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM za odlazne pozive"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Ostale postavke poziva"</string>
@@ -2506,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Informacije IMEI-ja"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Relativne informacije IMEI-ja"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Enkripcija"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Nastavi"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Ovaj uređaj možete dodatno zaštititi zahtijevanjem PIN-a kako bi se pokrenuo. Dok se uređaj ne pokrene, ne može primati pozive, poruke ni obavijesti, uključujući alarme. \n\nTime se štite podaci na izgubljenim ili ukradenim uređajima."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 92fa45d..9ae48d1 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Leválasztja?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ezzel befejezi a kapcsolatot a következővel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nincs engedélye a Bluetooth-beállítások módosítására."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> látható, ha megnyitja a Bluetooth-beállításokat."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"A(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> látható a közeli eszközök számára, ha megnyitja a Bluetooth-beállításokat."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Leválasztja a következőt: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Sugárzás"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil tiltása?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, Bluetooth, repülős mód, mobilhálózatok és VPN-ek kezelése"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobiladat-kapcsolat"</string>
     <string name="calls_title" msgid="3544471959217176768">"Hívások"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS-ek"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS-ek"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Adathasználat engedélyez. mobilhálózaton"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Adatforgalom barangoláskor"</string>
     <string name="roaming" msgid="3596055926335478572">"Adatbarangolás"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Közepes/magas védelem"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Jelszó"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Magas védelem"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Az eszközvédelmi funkciók nem fognak működni."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Rendszergazda, szabályzat vagy adattár letiltotta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nincs"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Söprés"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Feloldási minta törlése"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Feloldó PIN-kód törlése"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Feloldási jelszó eltávolítása"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Képernyőzár eltávolítása"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Feloldási minta módosítása"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"A feloldó PIN-kód módosítása"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Feloldási jelszó módosítása"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Zenéhez és médiához"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Beállítások megjegyzése"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi-kezelő"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Csatlakozva Wi‑Fi-segéddel"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Képernyő tartalmának átküldése"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Vezeték nélküli kijelző engedélyezése"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nem található a közelben más eszköz."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi beállítások"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Vezeték nélküli hozzáférési pontok beállítása és kezelése"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi-Fi-hálózat kiválasztása"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fi-hálózat kiválasztása"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Bekapcsolja a Wi-Fit?"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi kikapcsolása..."</string>
@@ -600,12 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"A keresés mindig elérhető"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Keresés engedélyezése mindig"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"A Google helyszolgáltatása és más alkalmazások akkor is kereshetnek hálózatokat, ha a Wi-Fi ki van kapcsolva"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Nyílt Wi‑Fi automatikus használata"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"A Wi-Fi-segéd automatikusan csatlakozhat a jó minőségűnek ítélt nyílt hálózatokhoz"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Segéd kiválasztása"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Tanúsítványok telepítése"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"A hely pontosságának javítása és egyéb célok érdekében a Google és más alkalmazások kereshetnek közeli Wi-Fi hálózatokat még akkor is, ha a Wi-Fi ki van kapcsolva. Ha nem szeretné ezt, állítsa át a Speciális &gt; A keresés mindig elérhető beállítást."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Az alkalmazások még akkor is megkereshetik a közeli hálózatokat, ha a Wi-Fi ki van kapcsolva. Ha nem szeretné ezt, állítsa át a Speciális &gt; A keresés mindig elérhető beállítást."</string>
@@ -699,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"FIGYELMEZTETÉS: ha kihagyja a Wi‑Fi bekapcsolását, akkor táblagépe csak mobiladatokat fog használni a kezdeti letöltésekhez és frissítésekhez. Az esetleges adatforgalmi díjak elkerülése érdekében csatlakozzon egy Wi-Fi-hálózathoz."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"FIGYELMEZTETÉS: ha kihagyja a Wi‑Fi bekapcsolását, akkor eszköze csak mobiladatokat fog használni a kezdeti letöltésekhez és frissítésekhez. Az esetleges adatforgalmi díjak elkerülése érdekében csatlakozzon egy Wi-Fi-hálózathoz."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"FIGYELMEZTETÉS: ha kihagyja a Wi‑Fi bekapcsolását, akkor telefonja csak mobiladatokat fog használni a kezdeti letöltésekhez és frissítésekhez. Az esetleges adatforgalmi díjak elkerülése érdekében csatlakozzon egy Wi-Fi-hálózathoz."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ha kihagyja a Wi‑Fi-t:\n\nTáblagépének nem lesz internetkapcsolata.\n\nNem kap szoftverfrissítéseket, amíg nem csatlakozik az internethez.\n\nMost nem aktiválhatja az eszköz védelmi funkcióit."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ha kihagyja a Wi‑Fi-t:\n\nEszközének nem lesz internetkapcsolata.\n\nNem kap szoftverfrissítéseket, amíg nem csatlakozik az internethez.\n\nMost nem aktiválhatja az eszköz védelmi funkcióit."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ha kihagyja a Wi‑Fi-t:\n\nTelefonjának nem lesz internetkapcsolata.\n\nNem kap szoftverfrissítéseket, amíg nem csatlakozik az internethez.\n\nMost nem aktiválhatja az eszköz védelmi funkcióit."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"A táblagép nem tudott csatlakozni ehhez a Wi-Fi hálózathoz."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Az eszköz nem tudott csatlakozni ehhez a Wi-Fi-hálózathoz."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"A telefon nem tudott csatlakozni ehhez a Wi-Fi hálózathoz."</string>
@@ -1016,8 +1012,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ez minden adatot töröl a táblagép "<b>"belső tárolójáról"</b>", többek között: \n \n"<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ez minden adatot töröl a telefon "<b>"belső tárolójáról"</b>", többek között: \n \n"<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jelenleg a következő fiókokba van bejelentkezve:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Más felhasználók is vannak ezen az eszközön.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Zene"</li>\n<li>"Fotók"</li>\n<li>"Más felhasználói adatok"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"USB-tárat"</b>" is törölnie kell."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"SD-kártyát"</b>" is törölnie kell."</string>
@@ -1091,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Helyezze be a SIM kártyát és indítsa újra"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Csatlakozzon az internethez"</string>
     <string name="location_title" msgid="1029961368397484576">"Saját pozíció"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Munkahelyi profil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"A munkahelyi profil helye"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Ezt az Ön vállalata letiltotta"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mód"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Nagyon pontos"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Energiatakarékos"</string>
@@ -1856,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Alkalmazásadatok is"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatikus helyreállítás"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Amikor újratelepít egy alkalmazást, a biztonsági mentésből állítsa helyre a beállításait és az adatokat"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"A biztonsági másolat szolgáltatás inaktív."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ezt az eszközszabályzat határozza meg."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Asztali mentés jelszava"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Az asztali teljes biztonsági mentések jelenleg nem védettek."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Érintse meg, ha módosítaná vagy eltávolítaná a jelszót az asztali teljes mentésekhez"</string>
@@ -2323,8 +2313,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>. SIM kártya"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"A SIM kártya üres"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM kártya neve"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Adja meg a SIM kártya nevét"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"%1$d. számú SIM-nyílás"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Szolgáltató"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Szám"</string>
@@ -2334,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lila"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nincs SIM kártya behelyezve"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM kártya állapota"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM kártyával kapcsolatos információ"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Visszahívás az alapértelmezett SIM kártyáról"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM kártya kimenő hívásokhoz"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Egyéb hívásbeállítások"</string>
@@ -2478,8 +2466,8 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Kezdés ideje"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Befejezés ideje"</string>
     <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> a következő napon"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>, illetve minden korábbi ébresztés"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> a következő napon, illetve minden korábbi ébresztés"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>, illetve minden korábbi ébresztéskor"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> a következő napon, illetve minden korábbi ébresztéskor"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Alkalmazásértesítések"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Értesítési beállítások"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Visszajelzés küldése az eszközről"</string>
@@ -2500,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-információ"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Relatív IMEI-információ"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Titkosítás"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Tovább"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"További védelmet adhat az eszköznek, ha annak elindítása előtt PIN kódot kér. Amíg az eszköz el nem indul, nem fogadhat hívásokat, üzeneteket vagy értesítéseket, az ébresztőket is beleértve. \n\nEz segít megóvni adatait, ha ellopják eszközét."</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 8493d6f..ee9037f 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Անջատե՞լ"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Սա կավարտի կապը &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&amp;gt-ի հետ"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Դուք թույլտվություն չունեք փոխելու Bluetooth կարգավորումները:"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> տեսանելի է մոտակա սարքերի համար, եթե Bluetooth կարգավորումները միացված են:"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը տեսանելի է մոտակա սարքերի համար, եթե Bluetooth կարգավորումները միացված են:"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Անջատե՞լ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը:"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Հեռարձակում"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Կասեցնե՞լ պրոֆիլը:"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Կառավարել WiFi-ը, Bluetooth-ը, թռիչքային ռեժիմը, բջջային ցանցերը և VPN-ները"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Բջջային տվյալներ"</string>
     <string name="calls_title" msgid="3544471959217176768">"Զանգեր"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS հաղորդագրություններ"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS հաղորդագրություններ"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Թույլատրել բջջային ցանցի միջոցով տվյալների կապի օգտագործումը"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Թույլ տալ տվյալների կապի օգտագործումը ռոումինգում"</string>
     <string name="roaming" msgid="3596055926335478572">"Տվյալների ռոումինգ"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Միջինից մինչև բարձր անվտանգություն"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Գաղտնաբառ"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Բարձր անվտանգություն"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Սարքի պաշտպանության գործառույթներն այլևս չեն գործելու:"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Կասեցված է ադմինիստրատորի, կոդավորման ծրագրի կամ վկայագրերի պահոցի կողմից"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ոչ մեկը"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Սահահարվածել"</string>
@@ -410,6 +411,7 @@
     <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_password_summary" msgid="192161194564577025">"Հեռացնել գաղտնաբառի ապակողպումը"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Հեռացնել էկրանի փականը"</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_password_title" msgid="5606298470358768865">"Փոխել ապակողպման գաղտնաբառը"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Երաժշտության և մեդիայի համար"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Հիշել կարգավորումները"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi Օգնական"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Կապակցված է Wi‑Fi Օգնականի միջոցով"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Հեռակա էկրան"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Միացնել անլար էկրանը"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Մոտակայքում սարքեր չեն գտնվել:"</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi կարգավորումներ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Կարգավորել և կառավարել անլար միացման կետերը"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Ընտրեք Wi-Fi ցանց"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Ընտրել Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi-ի միացում…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi-ն անջատվում է..."</string>
@@ -600,12 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Սկանավորումը միշտ հասանելի է"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Միշտ թույլատրել սկանավորումը"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Թույլատրել Google-ի տեղադրության ծառայությանը և այլ ծրագրերին սկանավորել ցանցեր` նույնիսկ երբ WiFi-ը անջատված է"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Ինքնաշխատ օգտագործել բաց Wi‑Fi ցանցերը"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Թույլ տալ Wi‑Fi օգնականին ինքնաշխատորեն միանալ բաց ցանցերին, որոնց որակը գնահատվում է որպես բարձր"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Օգնականի ընտրություն"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Տեղադրել վկայականները"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Տեղանքի ճշգրտությունը կատարելագործելու կամ այլ նպատակների համար` Google-ը և այլ ծրագրերը հնարավոր է սկանավորեն մոտակա ցանցերը, նույնիսկ եթե Wi-Fi-ը անջատված է: Եթե դուք չեք ցանկանում դա, անցեք դեպի Ընդլայնված &gt; Սկանավորումը միշտ հասանելի:"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Հավելվածը հնարավոր է սկանավորի մոտակա ցանցերը, անգամ եթե  Wi-Fi-ն անջատված է: Եթե չեք ցանկանում, որ սա պատահի, անցեք Ընդլայնված կարգավորումներ &gt; Սկանավորումը միշտ հասանելի է:"</string>
@@ -699,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ԶԳՈՒՇԱՑՈՒՄ. Եթե բաց թողնեք Wi-Fi-ը, ձեր գրասալիկը միայն կօգտագործի բջջային տվյալների կապը՝ նախնական ներբեռնումների և թարմացումների համար: Տվյալների կապի հնարավոր վճարներից խուսափելու համար միացեք որևէ Wi-Fi ցանցի:"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ԶԳՈՒՇԱՑՈՒՄ. Եթե բաց թողնեք Wi-Fi-ը, ձեր սարքը միայն կօգտագործի բջջային տվյալների կապը՝ նախնական ներբեռնումների և թարմացումների համար: Տվյալների կապի հնարավոր վճարներից խուսափելու համար միացեք որևէ Wi-Fi ցանցի:"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ԶԳՈՒՇԱՑՈՒՄ. Եթե բաց թողնեք Wi-Fi-ը, ձեր հեռախոսը միայն կօգտագործի բջջային տվյալների կապը՝ նախնական ներբեռնումների և թարմացումների համար: Տվյալների կապի հնարավոր վճարներից խուսափելու համար միացեք որևէ Wi-Fi ցանցի:"</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Եթե ​​չկարգավորեք Wi-Fi-ը.\n\nՁեր գրասալիկը համացանցի կապակցում չի ունենա:\n\nԴուք չեք ստանա ծրագրակազմի թարմացումներ մինչև համացանցին կապակցվելը:\n\nԴուք չեք կարողանա ակտիվացնել սարքի պաշտպանության գործառույթները:"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Եթե ​​չկարգավորեք Wi-Fi-ը.\n\nՁեր սարքը համացանցի կապակցում չի ունենա:\n\nԴուք չեք ստանա ծրագրակազմի թարմացումներ մինչև համացանցին կապակցվելը:\n\nԴուք չեք կարողանա ակտիվացնել սարքի պաշտպանության գործառույթները:"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Եթե չկարգավորեք Wi-Fi-ը.\n\nՁեր հեռախոսը համացանցի կապակցում չի ունենա:\n\nԴուք չեք ստանա ծրագրակազմի թարմացումներ մինչև համացանցին կապակցվելը:\n\nԴուք չեք կարողանա ակտիվացնել սարքի պաշտպանության գործառույթները:"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Գրասալիկը չկարողացավ միանալ Wi‑Fi ցանցին:"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Սարքը չկարողացավ միանալ այս Wi-Fi ցանցին:"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Հեռախոսը չկարողացավ միանալ այս Wi-Fi ցանցին:"</string>
@@ -836,7 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ինքնուրույն պայծառություն"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Բարձրացնել՝ միանալու համար"</string>
     <string name="doze_title" msgid="2259176504273878294">"Քնելու ռեժիմի արգելք"</string>
-    <string name="doze_summary" msgid="7128970177894383698">"Ակտիվացնում է էկրանը, երբ վերադառնում եք սարքին կամ ծանուցումներ ստանում"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Ակտիվացնում է էկրանը, երբ վերցնում եք սարքը կամ ծանուցումներ ստանում"</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>
@@ -1016,8 +1012,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Սա կջնջի բոլոր տվյալները ձեր գրասալիկի "<b>" ներքին պահոցից"</b>", այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Սա կջնջի բոլոր տվյալները ձեր սարքի "<b>"ներքին պահոցից"</b>", ներառյալ`\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված ծրագրերը"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Դուք այժմ գրանցված եք հետևյալ հաշիվներում՝\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Այս սարքում այլ օգտվողների հաշիվներ կան:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Երաժշտություն"</li>\n<li>"Լուսանկարներ"</li>\n<li>"Օգտվողի այլ տվյալներ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Երաժշտությունը, նկարները և այլ տվյալները ջնջելու համար "<b>"USB կրիչը "</b>"պետք է ջնջվի:"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Երաժշտությունը, նկարները և այլ տվյալները "<b>"SD քարտից"</b>" մաքրելու համար` այն պետք է ջնջել:"</string>
@@ -1091,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Խնդրում ենք տեղադրել SIM քարտ և վերագործարկել"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Խնդրում ենք միանալ ինտերնետին"</string>
     <string name="location_title" msgid="1029961368397484576">"Իմ տեղադրությունը"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Աշխատանքային պրոֆիլ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Տեղ աշխատանքային պրոֆիլի համար"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Անջատվել է ընկերության կողմից"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Ռեժիմ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Բարձր ճշգրտություն"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Մարտկոցի տնտեսում"</string>
@@ -1156,11 +1148,11 @@
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-ը սահմանված է"</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_pattern_label" msgid="5679630792003440352">"Փոխել ապակողպող նախշը"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Փոխել ապակողպման PIN-ը"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Հաստատել պահված նախշը"</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>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Գծեք ապակողպող նախշը"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Սեղմեք Ցանկ` օգնության համար:"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Հեռացրեք մատը ավարտելուց հետո"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Միացրեք առնվազն <xliff:g id="NUMBER">%d</xliff:g> կետ: Փորձեք կրկին:"</string>
@@ -1172,15 +1164,15 @@
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Կրկին փորձել"</string>
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"Շարունակել"</string>
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Ապակողպող նախշը"</string>
-    <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Պահանջել կաղապար"</string>
-    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Պետք է պատկերել կաղապարը` էկրանը ապակողպելու համար"</string>
+    <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Պահանջել նախշ"</string>
+    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Օգտագործել նախշ՝ հեռախոսը պաշտպանելու համար"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Կաղապարը տեսանելի դարձնել"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Թրթրռալ հպումից"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Հոսանքի կոճակը անկնթարթորեն կողպվում է"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Բացառությամբ, երբ ապակողպված է պահվում <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>-ի կողմից"</string>
-    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Սահմանել ապակողպման կաղապարը"</string>
-    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Փոխել ապակողպման կաղապարը"</string>
-    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Ինչպես պատկերել ապակողպման նախշը"</string>
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ստեղծել նախշ"</string>
+    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Փոխել ապակողպող նախշը"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Ինչպես ապակողպող նախշ գծել"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Չափից շատ սխալ փորձեր"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Կրկին փորձեք <xliff:g id="NUMBER">%d</xliff:g> վայրկյանից:"</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Հավելվածը տեղադրված չէ ձեր հեռախոսում:"</string>
@@ -1444,16 +1436,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Էկրանը երբեք չի քնի լիցքավորման ընթացքում"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Միացնել Bluetooth HCI snoop log-ը"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Կորզել բոլոր bluetooth HCI փաթեթները մի ֆայլում"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM ապակողպում"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Թույլ տալ սկզբնաբեռնման բեռնիչի ապակողպումը"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Մուտքագրեք PIN-ը"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Մուտքագրեք ձեր սարքի PIN-ը՝ OEM ապակողպումն ակտիվացնելու համար:"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Թույլատրե՞լ OEM ապակողպումը:"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ԶԳՈՒՇԱՑՈՒՄ. Այս կարգավորումը միացրած ժամանակ սարքի պաշտպանության գործառույթները չեն աջակցվի այս սարքի վրա:"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Անլար էկրանի վկայագրում"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Միացնել Wi‑Fi մանրամասն գրանցամատյանները"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi-ից կտրուկ անցում բջջային ինտերնետի"</string>
@@ -1860,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Ներառել ծրագրի տվյալները"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Ինքնուրույն վերականգնում"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Այս ծրագիրը ապատեղադրելու համար վերականգնեք կարգավորումները և տվյալները"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Կրկնօրինակման ծառայությունը ակտիվ չէ:"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Սարքի քաղաքականության համաձայն:"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Աշխատասեղանի պահուստավորման գաղտնաբառ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Աշխատասեղանի ամբողջական պահուստավորումները այժմ պաշտպանված չեն"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Աշխատասեղանի ամբողջական պահուստավորման համար ընտրել փոխել կամ հեռացնել գաղտնաբառը"</string>
@@ -2015,10 +2001,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Միշտ օգտագործել GPU-ն` էկրանի կազմման համար"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Նմանակել գունատարածքը"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ակտիվացնել OpenGL հետքերը"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Օգտագործել AwesomePlayer-ը (խորհուրդ չի տրվում)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Մեդիա նվագարկումների մեծ մասի համար օգտագործել AwesomePlayer-ը՝ NuPlayer-ի փոխարեն"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Անջատել USB աուդիո երթուղայնացումը"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Անջատել ավտոմատ երթուղայնացումը դեպի USB աուդիո սարքեր"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Ցուցադրել կապակցումների դասավորությունը"</string>
@@ -2329,8 +2313,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Մուտքագրեք SIM-ի անունը"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM քարտի բնիկ %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Օպերատորը"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Համար"</string>
@@ -2340,7 +2323,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"Այլ զանգերի կարգավորումներ"</string>
@@ -2483,9 +2465,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Երեկոյան աշխ. օրերին"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Մեկնարկի ժամը"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ավարտի ժամը"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>-ի հաջորդ օրը"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>-ը կամ որևէ ազդանշանից առաջ"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>-ի հաջորդ օրը կամ որևէ ազդանշանից առաջ"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>-ին հաջորդ օրը"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>-ին կամ որևէ զարթուցիչից առաջ"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>-ին հաջորդ օրը կամ որևէ զարթուցիչից առաջ"</string>
     <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>
@@ -2506,7 +2488,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Մնալ լանդշաֆտային դիրքով"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Մնալ ընթացիկ դիրքով"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-ի վերաբերյալ տվյալներ"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-ին վերաբերող տվյալներ"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Գաղտնագրում"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Շարունակել"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Դուք կարող եք նաև պաշտպանել այս սարքը՝ այն մեկնարկելուց առաջ պահանջելով մուտքագրել PIN-ը: Մինչև մեկնարկը սարքը չի կարող ստանալ զանգեր, հաղորդագրություններ կամ տեղեկացումներ, այդ թվում՝ զարթուցիչներ: \n\n Այս գործառույթն օգնում է պաշտպանել տվյալները՝ կորած կամ գողացված սարքերում:"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cfebb9d..4e32abe 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Putuskan sambungan?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ini akan mengakhiri sambungan Anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Anda tidak memiliki izin untuk mengubah setelan Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> terlihat oleh perangkat di sekitar saat Setelan Bluetooth dibuka."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Putuskan sambungan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Penyiaran"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Nonaktifkan profil?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Kelola Wi‑Fi, Bluetooth, mode pesawat, jaringan seluler, &amp; VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Data seluler"</string>
     <string name="calls_title" msgid="3544471959217176768">"Panggilan telepon"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Pesan SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Izinkan penggunaan data via jaringan seluler"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Gunakan data saat roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming data"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keamanan sedang hingga tinggi"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Sandi"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Keamanan tinggi"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dinonaktifkan oleh administrator, kebijakan enkripsi, atau penyimpanan kredensial"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Tidak ada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Gesek"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Hapus pola pembuka kunci"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Hapus PIN pembuka kunci"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Hapus sandi pembuka kunci"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ubah pola pembuka kunci"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ubah PIN pembuka kunci"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ubah sandi pembuka kunci"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk musik dan media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat setelan"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Terhubung melalui Asisten Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Layar Transmisi"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktifkan layar nirkabel"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tidak ditemukan perangkat terdekat."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Setelan Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Siapkan &amp; kelola titik akses nirkabel"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Pilih jaringan Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Pilih Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Menyalakan Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Mematikan Wi-Fi..."</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"PERINGATAN: jika Anda melompati Wi‑Fi, tablet Anda hanya akan menggunakan data seluler untuk unduhan dan pembaruan awal. Untuk menghindari kemungkinan biaya data, sambungkan ke Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"PERINGATAN: jika Anda melompati Wi‑Fi, perangkat Anda hanya akan menggunakan data seluler untuk unduhan dan pembaruan awal. Untuk menghindari kemungkinan biaya data, sambungkan ke Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"PERINGATAN: jika Anda melompati Wi‑Fi, ponsel Anda hanya akan menggunakan data seluler untuk unduhan atau pembaruan awal. Untuk menghindari kemungkinan biaya data, sambungkan ke Wi‑Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Jika Anda mengabaikan Wi‑Fi:\n\nTablet tidak akan memiliki sambungan internet.\n\nAnda tidak akan mendapatkan pembaruan perangkat lunak jika tidak tersambung ke internet.\n\nAnda tidak dapat mengaktifkan fitur perlindungan perangkat saat ini."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Jika Anda mengabaikan Wi‑Fi:\n\nPerangkat tidak akan memiliki sambungan internet.\n\nAnda tidak akan mendapatkan pembaruan perangkat lunak jika tidak tersambung ke internet.\n\nAnda tidak dapat mengaktifkan fitur perlindungan perangkat saat ini."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Jika Anda mengabaikan Wi‑Fi:\n\nPonsel tidak akan memiliki sambungan internet.\n\nAnda tidak akan mendapatkan pembaruan perangkat lunak jika tidak tersambung ke internet.\n\nAnda tidak dapat mengaktifkan fitur perlindungan perangkat saat ini."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet tidak dapat menyambung ke jaringan Wi-Fi ini."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Perangkat tidak dapat tersambung ke jaringan Wi‑Fi ini."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Ponsel tidak dapat menyambung ke jaringan Wi-Fi ini."</string>
@@ -1087,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Masukkan kartu SIM dan mulai ulang"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Sambungkan ke internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Lokasiku"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profil kerja"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokasi untuk profil kerja"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Dinonaktifkan oleh perusahaan Anda"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Akurasi tinggi"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Hemat baterai"</string>
@@ -1445,7 +1445,7 @@
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Masukkan PIN"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Masukkan PIN perangkat untuk mengaktifkan buka kunci OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Izinkan buka kunci OEM?"</string>
-    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"PERINGATAN: Fitur perlindungan perangkat tidak akan berfungsi di perangkat ini jika setelan ini diaktifkan."</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"PERINGATAN: Fitur perlindungan perangkat tidak akan berfungsi di perangkat ini saat setelan diaktifkan."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Sertifikasi layar nirkabel"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktifkan Pencatatan Log Panjang Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Pengalihan Wi-Fi Agresif ke Seluler"</string>
@@ -1852,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Sertakan data aplikasi"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan otomatis"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Memulihkan cadangan setelan dan data ketika memasang ulang apl"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Layanan cadangan tidak aktif."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ini ditetapkan oleh kebijakan perangkat Anda."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Sandi cadangan desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Saat ini cadangan desktop penuh tidak dilindungi"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Sentuh guna mengubah atau menghapus sandi untuk cadangan lengkap desktop"</string>
@@ -2007,8 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Selalu gunakan GPU untuk pengomposisian layar"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulasikan ruang warna"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktifkan jejak OpenGL"</string>
-    <string name="use_awesomeplayer" msgid="1583337008516364226">"Pakai AwesomePlayer (lama)"</string>
-    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Pakai AwesomePlayer, bukan NuPlayer untuk putar media"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Pakai AwesomePlayer (lawas)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Pakai AwesomePlayer untuk memutar media, bukan NuPlayer"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Perutean audio USB nonaktif"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Perutean otomatis ke periferal audio USB nonaktif"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Tampilkan batas tata letak"</string>
@@ -2319,8 +2317,7 @@
     <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 kosong"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nama SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Masukkan nama SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operator"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nomor"</string>
@@ -2330,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Ungu"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Tidak ada kartu SIM yang dimasukkan"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informasi terkait SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Teleponan balik dari SIM default"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM untuk panggilan keluar"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Setelan panggilan lainnya"</string>
@@ -2496,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Informasi IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informasi relatif IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Enkripsi"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Lanjutkan"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Anda dapat melindungi perangkat ini lebih lanjut dengan meminta PIN sebelum memulai perangkat. Jika perangkat belum dimulai, panggilan telepon, pesan, atau pemberitahuan, termasuk alarm, tidak dapat diterima. \n\nIni membantu melindungi data pada perangkat yang hilang atau dicuri."</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index a5395fc..c5c5aab 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Aftengja?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Þetta slítur tengingunni við:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Þú hefur ekki heimild til að breyta Bluetooth-stillingum."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er sýnilegt nálægum tækjum á meðan Bluetooth-stillingar eru opnar."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er sýnilegt nálægum tækjum á meðan Bluetooth-stillingar eru opnar."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Viltu aftengja <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Útsending"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Gera snið óvirkt?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Stjórna Wi-Fi, Bluetooth, flugstillingu, farsímakerfum og VPN-netum"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Farsímagögn"</string>
     <string name="calls_title" msgid="3544471959217176768">"Símtöl"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS-skilaboð"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS-skilaboð"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Leyfa gagnanotkun í farsímakerfi"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Leyfa gagnanotkun í reiki"</string>
     <string name="roaming" msgid="3596055926335478572">"Gagnareiki"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Miðlungs til mikið öryggi"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Aðgangsorð"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Mikið öryggi"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Eiginleikar til að vernda tæki munu ekki virka lengur."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Stjórnandi, dulkóðunarstefna eða skilríkjageymsla hefur gert óvirkt"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ekkert"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Strjúka"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjarlægja opnunarmynstur"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjarlægja PIN-númer"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Fjarlægja aðgangsorð"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Fjarlægja skjálás"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Breyta opnunarmynstri"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Breyta PIN-númeri"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Breyta aðgangsorði opnunar"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Fyrir tónlist og margmiðlunarefni"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Muna stillingar"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi aðstoð"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Tengt í gegnum Wi-Fi aðstoð"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Senda út skjá"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Leyfa þráðlausan skjá"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Engin nálæg tæki fundust."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Stillingar Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Setja upp og stjórna þráðlausum aðgangsstöðum"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Veldu Wi-Fi net"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Velja Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Kveikir á Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Slekkur á Wi‑Fi…"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"VIÐVÖRUN: Ef þú notar ekki Wi-Fi getur spjaldtölvan aðeins sótt efni og uppfærslur með farsímagögnum. Tengdu tölvuna við Wi-Fi til að komast hjá mögulegum gagnakostnaði."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"VIÐVÖRUN: Ef þú notar ekki Wi-Fi getur tækið aðeins sótt efni og uppfærslur með farsímagögnum. Tengdu tækið við Wi-Fi til að komast hjá mögulegum gagnakostnaði."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"VIÐVÖRUN: Ef þú notar ekki Wi-Fi getur síminn aðeins sótt efni og uppfærslur með farsímagögnum. Tengdu símann við Wi-Fi til að komast hjá mögulegum gagnakostnaði."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ef þú sleppir Wi‑Fi:\n\nSpjaldtölvan verður ónettengd.\n\nÞú færð ekki hugbúnaðaruppfærslur fyrr en þú tengist netinu.\n\nÞú getur ekki virkjað öryggiseiginleika tækisins á þessari stundu."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ef þú sleppir Wi‑Fi:\n\nTækið verður ónettengt.\n\nÞú færð ekki hugbúnaðaruppfærslur fyrr en þú tengist netinu.\n\nÞú getur ekki virkjað öryggiseiginleika tækisins á þessari stundu."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ef þú sleppir Wi‑Fi:\n\nSíminn verður ónettengdur.\n\nÞú færð ekki hugbúnaðaruppfærslur fyrr en þú tengist netinu.\n\nÞú getur ekki virkjað öryggiseiginleika tækisins á þessari stundu."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Spjaldtölvan gat ekki tengst þessu Wi-Fi neti."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Ekki var hægt að tengja tækið við þetta Wi-Fi net."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Síminn gat ekki tengst þessu Wi-Fi neti."</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Settu SIM-kortið í og endurræstu"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Tengdu tækið við netið"</string>
     <string name="location_title" msgid="1029961368397484576">"Staðsetningin mín"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Vinnusnið"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Staðsetning vinnusniðs"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Fyrirtækið slökkti á þessu"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Stilling"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Mikil nákvæmni"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Rafhlöðusparnaður"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Fela forritsgögn"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Sjálfvirk endurheimt"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Endurheimta vistaðar stillingar og gögn þegar forrit er enduruppsett"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Afritunarþjónustan er óvirk."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Tækjastefnan stillti þetta."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Aðgangsorð tölvuafritunar"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Heildarafritun á tölvu er ekki varin sem stendur."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Snertu til að breyta eða fjarlægja aðgangsorðið fyrir heildarafritun á tölvu"</string>
@@ -2319,8 +2313,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-kort <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Ekkert SIM-kort"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Heiti SIM-korts"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Sláðu inn heiti SIM-korts"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-kortarauf %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Símafyrirtæki"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Símanúmer"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Fjólublár"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Ekkert SIM-kort í"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Staða SIM-korts"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Upplýsingar tengdar SIM-korti"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Hringja til baka með sjálfgefnu SIM-korti"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-kort til að hringja með"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Aðrar símtalsstillingar"</string>
@@ -2496,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-upplýsingar"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-tengdar upplýsingar"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Dulkóðun"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Halda áfram"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Þú getur verndað þetta tæki betur með því að krefjast PIN-númers fyrir ræsingu. Áður en tækið er ræst getur það ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjurum. \n\nÞetta eykur gagnavernd í týndum eða stolnum tækjum."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c50002c..3ac1c84 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnettere?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Questa operazione terminerà la connessione con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Non sei autorizzato a modificare le impostazioni Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Con Imp. Bluetooth aperte <xliff:g id="DEVICE_NAME">%1$s</xliff:g> è rilevabile da altri dispositivi vicini."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Con le impostazioni Bluetooth aperte, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> è rilevabile da altri dispositivi vicini."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnetti <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Trasmissione"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disattivare il profilo?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gestisci Wi‑Fi, Bluetooth, modalità aereo, reti cellulari e VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Rete dati"</string>
     <string name="calls_title" msgid="3544471959217176768">"Chiamate"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Messaggi SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Messaggi SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Consenti utilizzo di dati su rete cell."</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Consenti util. dati in roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming dati"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Protezione medio-alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Protezione alta"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Le funzionalità di protezione del dispositivo non saranno più disponibili."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disattivata da amministratore, norma crittografia o archivio credenziali"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nessuno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Fai scorrere"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Rimuovi sequenza di sblocco"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Rimuovi PIN di sblocco"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Rimuovi password di sblocco"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Rimuovi il blocco dello schermo"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambia sequenza di sblocco"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambia PIN di sblocco"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambia password di sblocco"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per musica e audio media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ricorda impostazioni"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistente Wi‑Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connesso tramite assistente Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Trasmetti schermo"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Attiva display wireless"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nessun dispositivo Bluetooth vicino."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Impostazioni Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configura e gestisci punti di accesso wireless"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Seleziona rete Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Seleziona Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Attivazione Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Disattivazione Wi‑Fi…"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVVISO. Se non attivi il Wi‑Fi, il tablet utilizzerà solo la rete dati per gli aggiornamenti e i download iniziali. Per evitare possibili costi per i dati, connettiti al Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVVISO. Se non attivi il Wi‑Fi, il dispositivo utilizzerà solo la rete dati per gli aggiornamenti e i download iniziali. Per evitare possibili costi per i dati, connettiti al Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AVVISO. Se non attivi il Wi‑Fi, il telefono utilizzerà solo la rete dati per gli aggiornamenti e i download iniziali. Per evitare possibili costi per i dati, connettiti al Wi‑Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Se salti il Wi‑Fi:\n\nIl tuo tablet non avrà una connessione Internet.\n\nNon riceverai aggiornamenti software fino alla connessione a Internet.\n\nAl momento non puoi attivare le funzioni di protezione del dispositivo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Se salti il Wi‑Fi:\n\nIl dispositivo non avrà una connessione Internet.\n\nNon riceverai aggiornamenti software fino alla connessione a Internet.\n\nAl momento non puoi attivare le funzioni di protezione del dispositivo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Se salti il Wi‑Fi:\n\nIl telefono non avrà una connessione Internet.\n\nNon riceverai aggiornamenti software fino alla connessione a Internet.\n\nAl momento non puoi attivare le funzioni di protezione del dispositivo."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Impossibile collegare il tablet alla rete Wi‑Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Impossibile stabilire una connessione tra il dispositivo e la rete Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Impossibile collegare il telefono alla rete Wi‑Fi."</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserisci la scheda SIM e riavvia"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connettiti a Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"La mia posizione"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profilo di lavoro"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Posizione per profilo di lavoro"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Disattivata dalla tua azienda"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modalità"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisione"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Basso consumo"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Includi dati app"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Ripristino automatico"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"In caso di reinstallazione di un\'applicazione, ripristina impostazioni e dati di backup"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Il servizio di backup non è attivo."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Viene impostato in base alla norma del dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Password di backup desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"I backup desktop completi non sono attualmente protetti."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tocca per modificare o rimuovere la password per i backup desktop completi"</string>
@@ -2319,8 +2313,7 @@
     <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 vuota"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nome SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Inserisci il nome della SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot della SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operatore"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numero"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Viola"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nessuna scheda SIM inserita"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Stato SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informazioni relative alla SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Richiama da SIM predefinita"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM per chiamate in uscita"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Altre impostazioni chiamate"</string>
@@ -2496,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Dati IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Dati relativi all\'IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Crittografia"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continua"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Puoi proteggere ulteriormente il dispositivo attivando la richiesta del PIN prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, inclusi allarmi. \n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index cfb627a..52036b0 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"להתנתק?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏פעולה זו תסיים את החיבור עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"‏אין לך הרשאה לשנות את הגדרות ה-Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"‏<xliff:g id="DEVICE_NAME">%1$s</xliff:g> גלוי להתקנים סמוכים כאשר הגדרת Bluetooth פתוחה."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"‏<xliff:g id="DEVICE_NAME">%1$s</xliff:g> גלוי למכשירים קרובים כאשר הגדרת Bluetooth פתוחה."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"האם לנתק את <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"שידור"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"להשבית פרופיל?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"‏נהל Wi‑Fi‏, Bluetooth, מצב טיסה, רשתות סלולריות וחיבורי VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"נתונים סלולריים"</string>
     <string name="calls_title" msgid="3544471959217176768">"שיחות"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"‏הודעות SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"‏הודעות SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"התר שימוש בנתונים באמצעות רשת סלולרית"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"אפשר שימוש בנתונים בעת נדידה"</string>
     <string name="roaming" msgid="3596055926335478572">"נדידת נתונים"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"אבטחה בינונית עד גבוהה"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"סיסמה"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"אבטחה גבוהה"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"תכונות להגנת המכשיר יפסיקו לפעול."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"הושבת על ידי מדיניות ההצפנה של מנהל המערכת, או אחסון האישורים"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ללא"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"החלקה"</string>
@@ -410,6 +411,7 @@
     <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_password_summary" msgid="192161194564577025">"הסר סיסמה לביטול נעילה"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"הסר נעילת מסך"</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_password_title" msgid="5606298470358768865">"שנה סיסמת ביטול נעילה"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"עבור מוסיקה ומדיה"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"זכור הגדרות"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"‏מחובר באמצעות אסיסטנט ה-Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"‏מסך Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"‏הפעל תצוגת WiFi"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"לא נמצאו מכשירים בקרבת מקום."</string>
@@ -2320,7 +2323,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"הגדרות שיחה אחרות"</string>
@@ -2486,7 +2488,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"הישאר בתצוגה לרוחב"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"הישאר בכיוון המסך הנוכחי"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"‏פרטי IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"‏מידע הקשור ל-IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"הצפנה"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"המשך"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"‏באפשרותך לחזק את ההגנה על מכשיר זה על-ידי דרישת מספר ה-PIN שלך לפני הפעלתו. עד שהמכשיר יופעל, הוא לא לא יוכל לקבל שיחות, הודעות או התראות. \n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4b3dfc1..46b71c3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -132,7 +132,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"切断しますか？"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"この操作を行うと、次のデバイスとの接続が切断されます:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Bluetooth設定を変更する権限がありません。"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Bluetooth設定により<xliff:g id="DEVICE_NAME">%1$s</xliff:g>は周辺の端末に表示されています"</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>を切断しますか？"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ブロードキャスト"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"プロフィールを無効にしますか？"</string>
@@ -292,7 +293,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi-Fi、Bluetooth、機内モード、モバイルネットワーク、VPNを管理する"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"モバイルデータ"</string>
     <string name="calls_title" msgid="3544471959217176768">"通話"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMSメッセージ"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"モバイルネットワークでのデータ使用を許可"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"ローミング時にデータ使用を許可"</string>
     <string name="roaming" msgid="3596055926335478572">"データローミング"</string>
@@ -401,6 +403,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"管理者、暗号化ポリシー、または認証情報により無効"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"なし"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"スワイプ"</string>
@@ -412,6 +416,8 @@
     <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_password_summary" msgid="192161194564577025">"ロック解除パスワードを削除"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"ロック解除パスワードの変更"</string>
@@ -557,6 +563,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"音楽とメディア"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"設定を保存"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fiアシスタント"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fiアシスタント経由で接続"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"画面のキャスト"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ワイヤレスディスプレイの有効化"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"周辺にデバイスが見つかりません"</string>
@@ -586,8 +593,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fiの設定"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ワイヤレスアクセスポイントを設定する"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi-Fiネットワークの選択"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fiを選択"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-FiをONにしています…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-FiをOFFにしています…"</string>
@@ -602,12 +608,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"スキャンを常に実行する"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"スキャンを常に許可する"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-FiがOFFになっていても、Googleの位置情報サービスと他のアプリでネットワークをスキャンする"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"オープンWi-Fiを自動的に使用"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi-Fiアシスタントを使って高品質のオープンネットワークを自動的に判断して接続する"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"アシスタントの選択"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"証明書のインストール"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"位置情報の精度を向上させるため、Wi-FiがOFFの場合でもGoogleやその他のアプリは近くのネットワークをスキャンすることができます。このスキャンが必要ない場合は、[詳細設定] &gt; [スキャンを常に実行する]にアクセスします。"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-FiがOFFの場合でもアプリは近くのネットワークをスキャンできます。このスキャンが必要ない場合は、[詳細設定] &gt; [スキャンを常に実行する]にアクセスします。"</string>
@@ -701,12 +704,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"警告: [Wi‑Fi]をスキップすると、タブレットはモバイルデータのみを使って最初のダウンロードやアップデートを行います。データ通信料が発生する可能性を防ぐにはWi‑Fiに接続してください。"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"警告: [Wi‑Fi]をスキップすると、端末はモバイルデータのみを使って最初のダウンロードやアップデートを行います。データ通信料が発生する可能性を防ぐにはWi‑Fiに接続してください。"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"警告: [Wi‑Fi]をスキップすると、携帯電話はモバイルデータのみを使って最初のダウンロードやアップデートを行います。データ通信料が発生する可能性を防ぐにはWi‑Fiに接続してください。"</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Wi-Fiをスキップした場合:\n\nタブレットはインターネットに接続されません。\n\nインターネットに接続するまで、ソフトウェアは更新されません。\n\n現時点では端末保護機能を有効にできません。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Wi-Fiをスキップした場合:\n\n携帯端末はインターネットに接続されません。\n\nインターネットに接続するまで、ソフトウェアは更新されません。\n\n現時点では端末保護機能を有効にできません。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Wi-Fiをスキップした場合:\n\n携帯電話はインターネットに接続されません。\n\nインターネットに接続するまで、ソフトウェアは更新されません。\n\n現時点では端末保護機能を有効にできません。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"タブレットからこのWi-Fiネットワークに接続できませんでした。"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"端末からこのWi‑Fiネットワークに接続できませんでした。"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"携帯端末からこのWi-Fiネットワークに接続できませんでした。"</string>
@@ -1018,8 +1018,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"この操作を行うと、タブレットの以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"この操作を行うと、携帯端末の以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"以下のアカウントにログインしています:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"この端末には他にもユーザーがいます。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音楽"</li>\n<li>"画像"</li>\n<li>"他のユーザーデータ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"音楽、画像、その他のユーザーデータを消去する場合は"<b>"USBストレージデータ"</b>"を消去する必要があります。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"音楽、画像、その他のユーザーデータを消去するには、"<b>"SDカード"</b>"を消去する必要があります。"</string>
@@ -1093,12 +1092,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIMカードを挿入して再起動してください"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"インターネットに接続してください"</string>
     <string name="location_title" msgid="1029961368397484576">"現在地"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"ワークプロフィール"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ワークプロフィールの場所"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"会社がOFFに設定しています"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"モード"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"バッテリー節約"</string>
@@ -1446,16 +1442,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電中に画面をスリープにしない"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCIスヌープログを有効にする"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bluetooth HCIパケットをすべてファイルにキャプチャする"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEMロック解除"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"ブートローダーによるロック解除を許可する"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PINを入力してください"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEMロック解除を有効にするには端末のPINを入力してください"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEMロック解除の許可"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告: この設定をONにしている場合、この端末では端末保護機能を利用できません。"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ワイヤレスディスプレイ認証"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi-Fi詳細ログの有効化"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fiを強制的にモバイル接続に切り替える"</string>
@@ -1866,10 +1858,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"アプリのデータを含める"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自動復元"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"アプリを再インストールする際に、バックアップした設定とデータを復元する"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"バックアップサービスは無効"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"これは端末ポリシーで設定されています。"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"PCバックアップパスワード"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"デスクトップのフルバックアップは現在保護されていません"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"デスクトップのフルバックアップ用のパスワードを変更または削除する場合にタップします"</string>
@@ -2021,10 +2011,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"画面合成に常にGPUを使用する"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"色空間シミュレート"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGLトレースを有効化"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayerを使用（廃止）"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"ほとんどのメディア再生でNuPlayerの代わりにAwesomePlayerを使用"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USBオーディオルーティングを無効化"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USBオーディオ周辺機器への自動ルーティングを無効化"</string>
     <string name="debug_layout" msgid="5981361776594526155">"レイアウト境界を表示"</string>
@@ -2335,8 +2323,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM名を入力します"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIMスロット%1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"携帯通信会社"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"番号"</string>
@@ -2346,7 +2333,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"その他の通話設定"</string>
@@ -2512,7 +2498,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"横向きのままにする"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"現在の向きを維持する"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI情報"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI関連情報"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"暗号化"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"次へ"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"この端末の起動前にPINを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index c562072..651199c 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"გავწყვიტო კავშირი?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ეს დაასრულებს თქვენს კავშირს :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"თქვენ არ გაქვთ Bluetooth-ის პარამეტრების შეცვლის ნებართვა."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ჩანს ახლომდებარე მოწყობილობებზე, როდესაც Bluetooth პარამეტრები გახსნილია."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ჩანს ახლომდებარე მოწყობილობებზე, როდესაც Bluetooth პარამეტრები გახსნილია."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"გაწყდეს კავშირი <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"მაუწყებლობა"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"გავაუქმოთ პროფილი?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi-Fi, Bluetooth, თვითმფრინავის რეჟიმის, ფიჭური ქსელებისა და VPN მართვა"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"ფიჭური ინტერნეტი"</string>
     <string name="calls_title" msgid="3544471959217176768">"ზარები"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS შეტყობინებები"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS შეტყობინებები"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"ფიჭურ ქსელზე მობ. ინტერნეტის გამოყენება"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"როუმინგისას მობილური ინტერნეტი"</string>
     <string name="roaming" msgid="3596055926335478572">"ინტერნეტის როუმინგი"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"საშუალოდან მაღალი დონის უსაფრთხოება"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"პაროლი"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"მაღალი უსაფრთხოება"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"მოწყობილობის დაცვის ფუნქციები აღარ იმუშავებს."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disabled by administrator, encryption policy, or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"არც ერთი"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"გასრიალება"</string>
@@ -410,6 +411,7 @@
     <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_password_summary" msgid="192161194564577025">"განბლოკვის პაროლის წაშლა"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"ეკრანის დაბლოკვის ამოღება"</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_password_title" msgid="5606298470358768865">"განბლოკვის პაროლის შეცვლა"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"მუსიკისა და მულტიმედიისათვის"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"პარამეტრების დამახსოვრება"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi ასისტენტი"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"დაკავშირებულია Wi-Fi თანაშემწით"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"ეკრანის გადაცემა"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"უსადენო ეკრანის ჩართვა"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ახლომახლო მოწყობილობების მოძიება ვერ მოხერხდა."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi პარამეტრები"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"უსადენო წვდომის წერტილების დაყენება და მართვა"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"აირჩიეთ Wi-Fi ქსელი"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"აირჩიეთ Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi ირთვება…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"WiFi-ის გამორთვა…"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"გაფრთხილება: თუ Wi‑Fi-ს გამოტოვებთ, თქვენი ტაბლეტი ფიჭურ ინტერნეტს მხოლოდ საწყისი ჩამოტვირთვისათვის და განახლებებისთვის. მონაცემთა გადაცემის ხარჯების ასარიდებლად, დაუკავშირდით Wi‑Fi-ს."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"გაფრთხილება: თუ Wi‑Fi-ს გამოტოვებთ, თქვენი მოწყობილობა ფიჭურ ინტერნეტს მხოლოდ საწყისი ჩამოტვირთვისათვის და განახლებებისთვის. მონაცემთა გადაცემის ხარჯების ასარიდებლად, დაუკავშირდით Wi‑Fi-ს."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"გაფრთხილება: თუ Wi‑Fi-ს გამოტოვებთ, თქვენი ტელეფონი ფიჭურ ინტერნეტს მხოლოდ საწყისი ჩამოტვირთვისათვის და განახლებებისთვის. მონაცემთა გადაცემის ხარჯების ასარიდებლად, დაუკავშირდით Wi‑Fi-ს."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"თუ თქვენ გამოტოვებთ Wi-Fi-ს:\n\nთქვენს ტაბლეტს არ ექნება ინტერნეტ კავშირი.\n\nთქვენ ვერ მიიღებთ პროგრამულ განახლებებს, სანამ ინტერნეტს არ დაუკავშირდებით.\n\nამ დროს თქვენ შეგიძლიათ გაააქტიუროთ მოწყობილობის დაცვის შესაძლებლობები."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"თუ თქვენ გამოტოვებთ Wi-Fi-ს:\n\nთქვენს მოწყობილობას არ ექნება ინტერნეტ კავშირი.\n\nთქვენ ვერ მიიღებთ პროგრამულ განახლებებს, სანამ ინტერნეტს არ დაუკავშირდებით.\n\nამ დროს თქვენ შეგიძლიათ გაააქტიუროთ მოწყობილობის დაცვის შესაძლებლობები."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"თუ თქვენ გამოტოვებთ Wi-Fi-ს:\n\nთქვენს ტელეფონს არ ექნება ინტერნეტ კავშირი.\n\nთქვენ ვერ მიიღებთ პროგრამულ განახლებებს, სანამ ინტერნეტს არ დაუკავშირდებით.\n\nამ დროს თქვენ შეგიძლიათ გაააქტიუროთ მოწყობილობის დაცვის შესაძლებლობები."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ტაბლეტი ვერ დაუკავშირდა Wi‑Fi ქსელს."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"მოწყობილობა ამ Wi‑Fi ქსელს ვერ დაუკავშირდა."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ტელეფონის ჩართვა ამ Wi-Fi ქსელში ვერ მოხერხდა."</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"გთხოვთ, ჩადოთ SIM ბარათი და გადატვირთოთ"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"გთხოვთ, დააკავშიროთ ინტერნეტთან"</string>
     <string name="location_title" msgid="1029961368397484576">"ჩემი მდებარეობა"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"სამუშაო პროფილი"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ადგილმდებარეობა სამუშაო პროფილისათვის"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"გამორთულია თქვენი კომპანიის მიერ"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"რეჟიმი"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"მაღალი სიზუსტე"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ბატარეის დაზოგვა"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"აპის მონაცემების ჩათვლით"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ავტომატური აღდგენა"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"აპის ხელახალი ინსტალაციისას აღდგეს პარამეტრები და მონაცემები სარეზერვო კოპიიდან, თუ ის არსებობს"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"სარეზერვო სამსახური არ არის აქტიური."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ეს დაყენებულია თქვენი მოწყობილობის პოლიტიკით."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"დესკტოპის სარეზერვო ასლის პაროლი"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"დესკტოპის სრული სარეზერვო ასლები ამჟამად დაცული არ არის"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"შეეხეთ დესკტოპის სრული სარეზერვო ასლების პაროლის შესაცვლელად ან წასაშლელად"</string>
@@ -2319,8 +2313,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"შეიყვანეთ SIM-ის სახელი"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM სათავსო %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"ოპერატორი"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"ნომერი"</string>
@@ -2330,7 +2323,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"ზარის სხვა პარამეტრები"</string>
@@ -2496,7 +2488,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ლანდშაფტის ხედზე დარჩენა"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ამჟამინდელ ორიენტაციაზე დარჩენა"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI ინფორმაცია"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI შესაბამისი ინფორმაცია"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"დაშიფვრა"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"გაგრძელება"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ამ მოწყობილობის დაცვა დამატებით შეგიძლიათ, დაწყებამდე PIN-ის მოთხოვნით. მოწყობილობის დაწყებამდე ზარების, შეტყობინებების და შეხსენებების, ასევე მაღვიძარების მიღებას ვერ მოახერხებს. \n\nეს ტელეფონის დაკარგვის შემთხვევაში მონაცემთა დაცვას ემსახურება."</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index f85b588..9619e78 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ажыратылсын ба?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Бұл келесі құрылғымен байланысты үзеді:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Сізде Bluetooth параметрлерін өзгерту рұқсаты жоқ."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Bluetooth параметрлері ашық болғанда <xliff:g id="DEVICE_NAME">%1$s</xliff:g> маңайдағы құр-ға көрінеді."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ажырату керек пе?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Хабар тарату"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Профайл істен шығарылсын ба?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, Bluetooth, ұшақ режимін, ұялы желілерді және VPN басқару"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Ұялы деректер"</string>
     <string name="calls_title" msgid="3544471959217176768">"Қоңыраулар"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS хабарлары"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Ұялы желі арқылы деректерді пайдалануға рұқсат ету"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Роумингте деректерді пайдалануға рұқсат ету"</string>
     <string name="roaming" msgid="3596055926335478572">"Деректер роумингі"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Әкімші, кодтау саясаты немесе растау дерекқоры арқылы өшірілген"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ешқандай"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Жанау"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"Бекітпесін ашу кілтсөзін алып тастау"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"Бекітпе кілтсөзін өзгерту"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Музыка және медиа үшін"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Параметрлерді есте сақтау"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi көмекшісі арқылы қосылу орындалды"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Экран дисплейі"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Сымсыз дисплейді қосу"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Маңайдан құрылғылар табылмады"</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi параметрлері"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Сымсыз қол жетімділік нүктесін орнату және басқару"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi желісін таңдау"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi желісін таңдау"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi байланысын қосуда…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi байланысын өшіруде…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Тексеру әрқашан қол жетімді"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Тексеруге әрқашан рұқсат ету"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Google орынды анықтау қызметі және басқа қолданбалар тіпті Wi-Fi өшіріліп тұрса да желілердің бар-жоғын тексереді"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Wi‑Fi желісін автоматты түрде пайдалану"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi‑Fi көмекшісіне сапасы жоғары екені анықталған ашық желілерге автоматты түрде қосылуға мүмкіндік береді"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Көмекшіні таңдау"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Сертификаттар орнату"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Аймақ нақтылығын жақсарту және басқа мақсаттар үшін Google және басқа қолданбалар маңайдағы желілерді тексеруі мүмкін, Wi-Fi өшіріліп тұрса да. Егер бұны қаламасаңыз, Жетілдірілген&gt; Тексеру әрқашан қол жетімді тармақтарына кіріңіз."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Қолданбалардың маңайдағы желілерді тексеру мүмкіндігі болады, Wi-Fi өшіріліп тұрса да. Егер бұны қаламасаңыз, Жетілдірілген&gt; Тексеру әрқашан қол жетімді тармақтарына кіріңіз."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ЕСКЕРТУ: егер Wi‑Fi қадамын өткізіп жіберсеңіз, планшет бастапқы жүктеулер және жаңартулар үшін тек ұялы деректерді пайдаланады. Ықтимал деректер ақыларын болдырмау үшін Wi‑Fi желісіне қосылыңыз."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ЕСКЕРТУ: егер Wi‑Fi қадамын өткізіп жіберсеңіз, құрылғы бастапқы жүктеулер және жаңартулар үшін тек ұялы деректерді пайдаланады. Ықтимал деректер ақыларын болдырмау үшін Wi‑Fi желісіне қосылыңыз."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ЕСКЕРТУ: егер Wi‑Fi қадамын өткізіп жіберсеңіз, телефон бастапқы жүктеулер және жаңартулар үшін тек ұялы деректерді пайдаланады. Ықтимал деректер ақыларын болдырмау үшін Wi‑Fi желісіне қосылыңыз."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Wi‑Fi желісін өткізіп жіберсеңіз:\n\nПланшетіңізде интернет байланысы болмайды.\n\nИнтернетке қосылғанша бағдарламалық жасақтама жаңартуларын алмайсыз.\n\nҚазіргі уақытта құрылғының қорғау мүмкіндіктерін белсендіре алмайсыз."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Wi‑Fi желісін өткізіп жіберсеңіз:\n\nҚұрылғыңызда интернет байланысы болмайды.\n\nИнтернетке қосылғанша бағдарламалық жасақтама жаңартуларын алмайсыз.\n\nҚазіргі уақытта құрылғының қорғау мүмкіндіктерін белсендіре алмайсыз."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Wi‑Fi желісін өткізіп жіберсеңіз:\n\nТелефоныңызда интернет байланысы болмайды.\n\nИнтернетке қосылғанша бағдарламалық жасақтама жаңартуларын алмайсыз.\n\nҚазіргі уақытта құрылғының қорғау мүмкіндіктерін белсендіре алмайсыз."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Планшет осы Wi‑Fi желісіне қосыла алмады."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Құрылғы осы Wi‑Fi желісіне қосыла алмады."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефон осы Wi‑Fi желісіне жалғана алмады."</string>
@@ -1016,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Бұл сіздің планшетіңіздің "<b>"ішкі жадынан"</b>" барлық дерекқорды өшіреді, келесі деректерді қоса:\n\n"<li>"Google есептік жазбаңыз"</li>\n<li>"Жүйе және қолданба дерекқоры және параметрлері"</li>\n<li>"Жүктелген қолданбалар"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Бұл телефонның "<b>"ішкі жадынан"</b>" барлық деректерді өшіреді:\n\n"<li>" Google есептік жазбаңызды"</li>\n<li>"Жүйе және қолданба дерекқоры мен параметрлерін"</li>\n<li>"Жүктелген қолданбаларды"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Сіз келесі есептік жазбаларға кірдіңіз:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Осы құрылғыда басқа пайдаланушылар бар.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Mузыка"</li>\n<li>"Фотосуреттер"</li>\n<li>"Басқа пайдаланушы деректері"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Музыка, фотосуреттер және басқа деректерді өшіру үшін, "<b>"USB жадын"</b>" өшіру қажет."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Музыка, фотосуреттер және басқа пайдаланушы деректерін тазалау үшін "<b>"SD картасы"</b>" өшірілуі тиіс."</string>
@@ -1091,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM картасын енгізіп, қайта бастаңыз"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Интернетке қосылыңыз"</string>
     <string name="location_title" msgid="1029961368397484576">"Mенің аймағым"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Жұмыс профилі"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Жұмыс профилінің орны"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Компанияңыз өшірген"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Жоғары дәлдік"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Батарея үнемдеу"</string>
@@ -1444,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Зарядтау кезінде экран ұйықтамайды"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI snoop тіркелімін қосу"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Барлық bluetooth HCI жинақтарын файлға сақтаңыз"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM бекітпесін ашу"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Жүктеуші бекітпесін ашуға рұқсат ету"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN кодын енгізіңіз"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM бекітпесін ашуды қосу үшін құрылғының PIN кодын енгізіңіз"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM бекітпесін ашуға рұқсат ету керек пе?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ЕСКЕРТУ: осы параметр қосулы кезде осы құрылғыда құрылғыны қорғау мүмкіндіктері жұмыс істемейді."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сымсыз дисплей сертификаты"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi егжей-тегжейлі журналға тір. қосу"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Агрессивті Wi‑Fi жел. ұялы жел. ауыстыру"</string>
@@ -1860,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Қолданба деректерін қамту"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Aвтоматтық қалпына келтіру"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Қолданбаны қайта орнатқанда параметрлер және деректердің сақтық көшірмесін қалпына келтіріңіз"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Сақтық көшірме жасау қызметі белсенді емес."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Бұл құрылғы саясаты арқылы орнатылған."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Компьютер үстелінің сақтық көшірмесі"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Жұмыс үстелінің сақтық көшірмелері қазір қорғалмаған"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Жұмыс үстелінің толық сақтық көшірмесінің кілтсөзін өзгерту немесе жою үшін түртіңіз"</string>
@@ -2015,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Экранды жасақтау үшін әрқашан графикалық процессор қолдану қажет"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Түстер аймағына еліктеу"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL (ашық графика кітапханасы) қолданбасы қосу"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer пайдалану (ескірген)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Медианың көпшілігін ойнату үшін NuPlayer орнына AwesomePlayer пайдалану"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB аудио бағыттау. өшіру"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB перифериялық аудио құр-на автоматты бағ. өшіру"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Орналасу жиектерін көрсету"</string>
@@ -2329,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM атауын енгізіңіз"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"%1$d SIM слоты"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Нөмір"</string>
@@ -2340,7 +2327,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"Басқа қоңырау параметрлері"</string>
@@ -2506,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Пейзаждық көріністе қалу"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ағымдағы бағдарда қалу"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI ақпараты"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI кодына қатысты ақпарат"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифрлау"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Жалғастыру"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Іске қосылуы алдында PIN кодын талап ету арқылы осы құрылғыны қосымша қорғауға болады. Іске қосылғанша құрылғы қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде, дабылдарды қабылдай алмайды. \n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі."</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index eceff3e..97caeb9 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ផ្ដាច់?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"វា​នឹង​បញ្ចប់​ការ​តភ្ជាប់​​ជា​មួយ៖&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"អ្នក​មិន​មាន​សិទ្ធិ​ ដើម្បី​​ប្ដូរ​ការ​កំណត់​ប៊្លូធូស​ទេ។"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ឧបករណ៍នៅក្បែរអាចមើលឃើញ<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ពេលការ​កំណត់ប៊្លូធូស​បានបើក។"</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ផ្ដាច់ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ការ​ផ្សាយ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"បិទ​ប្រវត្តិរូប?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"គ្រប់គ្រង​វ៉ាយហ្វាយ, ប៊្លូធូស, របៀប​ជិះ​យន្តហោះ, បណ្ដាញ​ចល័ត, &amp; VPNs"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"ទិន្នន័យ​ចល័ត"</string>
     <string name="calls_title" msgid="3544471959217176768">"ហៅ"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"សារ SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"ឲ្យការប្រើប្រាស់ទិន្នន័យ​លើបណ្ដាញ​ចល័ត"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"អនុញ្ញាតប្រើទិន្នន័យពេលរ៉ូមីង"</string>
     <string name="roaming" msgid="3596055926335478572">"រ៉ូមីង​ទិន្នន័យ"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"បាន​បិទ​ដោយ​​អ្នក​គ្រប់គ្រង ការ​ដាក់​លេខ​កូដ​គោលនយោបាយ ឬ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"គ្មាន"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"អូស"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"លុប​ពាក្យ​សម្ងាត់​ដោះ​សោ"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"ប្ដូរ​ពាក្យសម្ងាត់​ដោះ​សោ"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"សម្រាប់​តន្ត្រី និង​មេឌៀ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ចងចាំ​ការ​កំណត់"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"ជំនួយការ​វ៉ាយហ្វាយ"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"បានភ្ជាប់តាមរយៈជំនួយការ Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"ខាស​អេក្រង់"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"បើក​ការ​បង្ហាញ​ឥត​ខ្សែ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"រក​មិន​ឃើញ​ឧបករណ៍​ដែល​នៅ​ក្បែរ"</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"ការកំណត់​វ៉ាយហ្វាយ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"វ៉ាយហ្វាយ"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"រៀបចំ &amp; គ្រប់គ្រង​ចំណុច​ចូល​ដំណើរការ​ឥត​ខ្សែ"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"ជ្រើសរើសបណ្តាញ Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"ជ្រើស​វ៉ាយហ្វាយ"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"កំពុង​បើក​វ៉ាយហ្វាយ..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"កំពុង​បិទ​វ៉ាយហ្វាយ..."</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ព្រមាន​៖ ប្រសិន​បើ​អ្នក​រំលង​ប្រព័ន្ធ​វ៉ាយហ្វាយ កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក​នឹង​ប្រើ​តែ​​ទិន្នន័យ​ចល័ត​សម្រាប់​ការ​ធ្វើ​បច្ចុប្បន្នភាព និង​ការ​ទាញយក​ដំបូង។ ដើម្បី​ជៀសវាង​ការ​គិត​ប្រាក់​សម្រាប់​​ទិន្នន័យ, តភ្ជាប់​ទៅ​វ៉ាយហ្វាយ។"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ព្រមាន​៖ ប្រសិន​បើ​អ្នក​រំលង​វ៉ាយហ្វាយ ឧបករណ៍​របស់​អ្នក​នឹង​ប្រើ​តែ​ទិន្នន័យ​ចល័ត​សម្រាប់​ការ​ធ្វើ​បច្ចុប្បន្នភាព និង​ការ​ទាញយក​ដំបូង​។ ដើម្បី​ជៀសវាង​គិត​ប្រាក់​សម្រាប់​​​ទិន្នន័យ​, តភ្ជាប់​ទៅ​វ៉ាយហ្វាយ។"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ព្រមាន​៖ ប្រសិន​បើ​អ្នក​រំលង​វ៉ាយហ្វាយ ទូរស័ព្ទ​របស់​អ្នក​នឹង​ប្រើ​តែ​ទិន្នន័យ​ចល័ត​សម្រាប់​ការ​ធ្វើ​បច្ចុប្បន្នភាព និង​ការ​ទាញយក​ដំបូង។ ដើម្បី​ជៀសវាង​​ការ​គិត​ប្រាក់​​​សម្រាប់​​ទិន្នន័យ, តភ្ជាប់​ទៅ​វ៉ាយហាយ។"</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"ប្រសិនបើអ្នករំលង Wi‑Fi៖\n\nថេប្លេតរបស់អ្នកនឹងមិនមានការភ្ជាប់អ៊ីនធឺណិតទេ។\n\nអ្នកនឹងមិនទទួលបានការធ្វើបច្ចុប្បន្នភាពកម្មវិធីឡើយ រហូតទាល់តែអ្នកភ្ជាប់ទៅអ៊ីនធឺណិត។\n\nអ្នកមិនអាចធ្វើសកម្មភាពលក្ខណៈពិសេសការពារឧបករណ៍នៅពេលនេះទេ។"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"ប្រសិនបើអ្នករំលង Wi‑Fi៖\n\nឧបករណ៍របស់អ្នកនឹងមិនមានការភ្ជាប់អ៊ីនធឺណិតទេ។\n\nអ្នកនឹងមិនទទួលបានការធ្វើបច្ចុប្បន្នភាពកម្មវិធីឡើយ រហូតទាល់តែអ្នកភ្ជាប់ទៅអ៊ីនធឺណិត។\n\nអ្នកមិនអាចធ្វើសកម្មភាពលក្ខណៈពិសេសការពារឧបករណ៍នៅពេលនេះទេ។"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"ប្រសិនបើអ្នករំលង Wi‑Fi៖\n\nទូរស័ព្ទរបស់អ្នកនឹងមិនមានការភ្ជាប់អ៊ីនធឺណិតទេ។\n\nអ្នកនឹងមិនទទួលបានការធ្វើបច្ចុប្បន្នភាពកម្មវិធីឡើយ រហូតទាល់តែអ្នកភ្ជាប់ទៅអ៊ីនធឺណិត។\n\nអ្នកមិនអាចធ្វើសកម្មភាពលក្ខណៈពិសេសការពារឧបករណ៍នៅពេលនេះទេ។"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"កុំព្យូទ័រ​បន្ទះ​មិន​អាច​​ភ្ជាប់​ទៅ​បណ្ដាញ​វ៉ាយហ្វាយ​នេះ​បាន​ទេ។"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"ឧបករណ៍​មិន​អាច​តភ្ជាប់​ទៅ​បណ្ដាញ​វ៉ាយហ្វាយ​នេះ​បាន​ទេ។"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ទូរស័ព្ទ​មិន​អាច​តភ្ជាប់​ទៅ​បណ្ដាញ​វ៉ាយហ្វាយ​នេះ"</string>
@@ -1087,12 +1090,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"ប្រវត្តិរូប​ការងារ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ទីតាំងសម្រាប់ប្រវត្តិរូបការងាររបស់អ្នក"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"បានបិទដោយក្រុមហ៊ុនរបស់អ្នក"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"របៀបកំណត់"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ភាព​ត្រឹមត្រូវ​ខ្ពស់"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ការ​សន្សំ​ថ្ម"</string>
@@ -1440,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"អេក្រង់​នឹង​មិន​ដេក​ពេល​បញ្ចូល​ថ្ម"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"បើក​កំណត់​ហេតុ HCI snoop ប៊្លូធូស"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ចាប់​យក​​​កញ្ចប់​ HCI​ ប៊្លូ​ធូ​ស ទាំង​អស់​នៅ​ក្នុង​ឯកសារ"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"ការដោះសោ OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"អនុញ្ញាតឲ្យដោះសោកម្មវិធីចាប់ផ្តើមប្រព័ន្ធ"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"បញ្ចូល​កូដ PIN របស់​អ្នក"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"បញ្ចូល​កូដ PIN ឧបករណ៍​របស់​អ្នក ដើម្បី​បើក​ការ​ដោះ​សោ OEM"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"អនុញ្ញាតការដោះសោ OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ព្រមាន៖ លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនដំណើរការនៅលើឧបករណ៍នេះទេ ខណៈពេលដែលការកំណត់នេះត្រូវបានបើក។"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"បង្ហាញ​ការ​កំណត់​រចនាសម្ព័ន្ធ​ឥត​ខ្សែ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"បើក​កំណត់ហេតុ​រៀបរាប់​វ៉ាយហ្វាយ"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"វ៉ាយហ្វាយ​បង្ខំ​ទៅ​ការ​បញ្ជូន​ចល័ត"</string>
@@ -1856,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"រួម​បញ្ចូល​ទិន្នន័យ​កម្មវិធី"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ស្ដារ​ឡើង​វិញ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"ពេល​ដំឡើង​កម្មវិធី​ឡើងវិញ ស្ដារ​ការ​កំណត់​បម្រុងទុក និង​ទិន្នន័យ"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"សេវាកម្មបម្រុងអសកម្ម។"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"វាត្រូវបានកំណត់ដោយគោលការណ៍ឧបករណ៍របស់អ្នក។"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ពាក្យ​សម្ងាត់​បម្រុង​ទុក​លើ​ផ្ទៃតុ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ការ​បម្រុង​ទុក​ពេញលេញ​លើ​ផ្ទៃតុ​បច្ចុប្បន្ន​មិន​ត្រូវ​បាន​ការពារ​ទេ។"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ប៉ះ ដើម្បី​ប្ដូរ ឬ​លុប​ពាក្យ​សម្ងាត់​សម្រាប់​ការ​បម្រុងទុក​ពេញលេញ​លើ​ផ្ទៃតុ"</string>
@@ -2011,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ប្រើ GPU ជា​និច្ច​សម្រាប់​​ផ្សំ​អេក្រង់"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"ក្លែង​ធ្វើ​ចន្លោះ​ពណ៌"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"បើក​ដាន​ OpenGL"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"ប្រើ AwesomePlayer (បានបញ្ឈប់)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"ប្រើ AwesomePlayer ជំនួសឲ្យ NuPlayer សម្រាប់កម្មវិធីលេងឯកសារកំសាន្តភាគច្រើន"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"បិទការនាំផ្លូវអូឌីយ៉ូយូអេសប៊ី"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"បិទការនាំផ្លូវស្វ័យប្រវត្តិទៅឧបករណ៍អូឌីយ៉ូ​យូអេសប៊ី"</string>
     <string name="debug_layout" msgid="5981361776594526155">"បង្ហាញ​ព្រំដែន​ប្លង់"</string>
@@ -2325,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"បញ្ចូលឈ្មោះស៊ីមកាត"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"រន្ធ​ស៊ីម %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"ក្រុមហ៊ុន​បញ្ជូន"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"លេខ"</string>
@@ -2336,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"ស្វាយ"</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>
@@ -2502,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ស្ថិតនៅ​​ក្នុង​ទិដ្ឋភាព​ទេសភាព"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ស្ថិត​នៅ​ក្នុង​​ទិស​ដៅ​​បច្ចុប្បន្ន"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"ព័ត៌មាន IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"ព័ត៌មាន​ទាក់ទង​នឹង IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"ការ​អ៊ិនគ្រីប"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"បន្ត"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"អ្នក​អាច​ការពារ​ឧបករណ៍​នេះ​បន្ថែម​ទៀត​ដោយ​ទាមទារ​​កូដ PIN របស់​អ្នក​មុន​ពេល​វា​ចាប់ផ្ដើម។ រហូត​ដល់​ឧបករណ៍​ចាប់ផ្ដើម វា​មិន​អាច​ទទួល​ការ​​ហៅ, សារ ឬ​ការ​ជូន​ដំណឹង​​រួមមាន ការ​រោទ៍​។ \n\nវា​ជួយ​ការពារ​ទិន្នន័យ​នៅ​ពេល​ឧបករណ៍​បាត់ ឬ​គេ​លួច។"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 848db05..40f7418 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ಇದರೊಂದಿಗೆ ನಿಮ್ಮ ಸಂಪರ್ಕವನ್ನು ಇದು ಕೊನೆಗೊಳಿಸುತ್ತದೆ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"ಬ್ಲೂಟೂತ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಅನುಮತಿ ಹೊಂದಿಲ್ಲ."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ಬ್ಲೂಟೂತ್‌‌ ತೆರೆದಾಗ ಸಮೀಪ ಸಾಧನಗಳಲ್ಲಿ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಕಾಣಿಸುತ್ತದೆ."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ಬ್ಲೂಟೂತ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮುಕ್ತವಾಗಿರುವಾಗ ಸಮೀಪದ ಸಾಧನಗಳಿಗೆ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಗೋಚರಿಸುತ್ತದೆ."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ಪ್ರಸಾರ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ಪ್ರೊಫೈಲ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, ಬ್ಲೂಟೂತ್, ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್, ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳು &amp; VPN ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ"</string>
     <string name="calls_title" msgid="3544471959217176768">"ಕರೆಗಳು"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS ಸಂದೇಶಗಳು"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS ಸಂದೇಶಗಳು"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್ ಮೂಲಕ ಡೇಟಾ ಬಳಕೆ ಅನುಮತಿಸಿ"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ ಡೇಟಾ ಬಳಕೆಯನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="roaming" msgid="3596055926335478572">"ಡೇಟಾ ರೋಮಿಂಗ್"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ಮಧ್ಯಮದಿಂದ ಅಧಿಕವರೆಗೆ ಭದ್ರತೆ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ಅಧಿಕ ಭದ್ರತೆ"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಇನ್ನು ಮುಂದೆ ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"ನಿರ್ವಾಹಕ, ಎನ್‌ಕ್ರಿಪ್ಷನ್, ಅಥವಾ ರುಜುವಾತು ಸಂಗ್ರಹಣೆಯಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ಸ್ವೈಪ್"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ತೆಗೆದುಹಾಕು"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"ಅನ್‌ಲಾಕ್ ಪಿನ್‌ ತೆಗೆದುಹಾಕು"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"ಅನ್‌ಲಾಕ್ ಪಾಸ್‌ವರ್ಡ್ ತೆಗೆದುಹಾಕು"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"ಪರದೆ ಲಾಕ್ ತೆಗೆದುಹಾಕಿ"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ಬದಲಾಯಿಸಿ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ಅನ್‌ಲಾಕ್ ಪಿನ್‌ ಬದಲಾಯಿಸಿ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ಅನ್‌ಲಾಕ್ ಪಾಸ್‌ವರ್ಡ್‌ ಬದಲಾಯಿಸಿ"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ಸಂಗೀತ ಮತ್ತು ಮಾಧ್ಯಮಕ್ಕಾಗಿ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೆನಪಿನಲ್ಲಿಡು"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi ಸಹಾಯಕ"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi ಸಹಾಯಕದ ಮೂಲಕ ಸಂಪರ್ಕಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"ಬಿತ್ತರಿಸುವಿಕೆ ಪರದೆ"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ವೈರ್‌ಲೆಸ್ ಪ್ರದರ್ಶನ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ಯಾವುದೇ ಹತ್ತಿರದ ಸಾಧನಗಳು ಕಂಡುಬಂದಿಲ್ಲ."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ವಯರ್‌ಲೆಸ್‌ ಪ್ರವೇಶಿಸುವಿಕೆ ಅಂಶಗಳನ್ನು ಹೊಂದಿಸಿ &amp; ನಿರ್ವಹಿಸಿ"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi-Fi ನೆಟ್‌ವರ್ಕ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi ಆನ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi ಆಫ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ಎಚ್ಚರಿಕೆ: ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ಆರಂಭಿಕ ಡೌನ್‌ಲೋಡ್‌ಗಳು ಮತ್ತು ನವೀಕರಣಗಳಿಗಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾವನ್ನು ಮಾತ್ರ ಬಳಸುತ್ತದೆ. ಸಂಭಾವ್ಯ ಡೇಟಾ ಶುಲ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸಲು, Wi-Fi ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ಎಚ್ಚರಿಕೆ: ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ಆರಂಭಿಕ ಡೌನ್‌ಲೋಡ್‌ಗಳು ಮತ್ತು ನವೀಕರಣಗಳಿಗಾಗಿ ನಿಮ್ಮ ಸಾಧನ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾವನ್ನು ಮಾತ್ರ ಬಳಸುತ್ತದೆ. ಸಂಭಾವ್ಯ ಡೇಟಾ ಶುಲ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸಲು, Wi-Fi ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ಎಚ್ಚರಿಕೆ: ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ಆರಂಭಿಕ ಡೌನ್‌ಲೋಡ್‌ಗಳು ಮತ್ತು ನವೀಕರಣಗಳಿಗಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾವನ್ನು ಮಾತ್ರ ಬಳಸುತ್ತದೆ. ಸಂಭಾವ್ಯ ಡೇಟಾ ಶುಲ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸಲು, Wi-Fi ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ:\n\nನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿರುವುದಿಲ್ಲ.\n\nನೀವು ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಗೊಳ್ಳುವವರೆಗೂ ನೀವು ಸಾಫ್ಟ್‌ವೇರ್ ನವೀಕರಣಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳುವುದಿಲ್ಲ.\n\nಈ ಸಮಯದಲ್ಲಿ ನಿಮಗೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"ನೀವು Wi-Fi ಅನ್ನು ಸ್ಕಿಪ್ ಮಾಡಿದರೆ:\n\nನಿಮ್ಮ ಸಾಧನವು ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿರುವುದಿಲ್ಲ.\n\nನೀವು ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಗೊಳ್ಳುವವರೆಗೂ ನೀವು ಸಾಫ್ಟ್‌ವೇರ್ ನವೀಕರಣಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳುವುದಿಲ್ಲ.\n\nಈ ಸಮಯದಲ್ಲಿ ನಿಮಗೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ:\n\nನಿಮ್ಮ ಫೋನ್ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿರುವುದಿಲ್ಲ.\n\nನೀವು ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಗೊಳ್ಳುವವರೆಗೂ ನೀವು ಸಾಫ್ಟ್‌ವೇರ್ ನವೀಕರಣಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳುವುದಿಲ್ಲ.\n\nಈ ಸಮಯದಲ್ಲಿ ನಿಮಗೆ ಸಾಧನ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ಈ Wi‑Fi ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಟ್ಯಾಬ್ಲೆಟ್‌‌ ಅನ್ನು ಸಂಪರ್ಕಪಡಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"ಸಾಧನಕ್ಕೆ ಈ Wi-Fi ನೆಟ್‌ವರ್ಕ್ ಸಂಪರ್ಕಪಡಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ಈ Wi‑Fi ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಫೋನ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
@@ -1087,12 +1086,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ನ ಸ್ಥಳ"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"ನಿಮ್ಮ ಕಂಪನಿಯಿಂದ ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"ಮೋಡ್"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ಅಧಿಕ ನಿಖರತೆ"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ಬ್ಯಾಟರಿ ಉಳಿತಾಯ"</string>
@@ -1440,16 +1436,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ಚಾರ್ಜ್ ಮಾಡುವಾಗ ಪರದೆಯು ಎಂದಿಗೂ ನಿದ್ರಾವಸ್ಥೆಗೆ ಹೋಗುವುದಿಲ್ಲ"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ಬ್ಲೂಟೂತ್‌‌ HCI ಸ್ನೂಪ್ ಲಾಗ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ಫೈಲ್‌ನಲ್ಲಿ ಎಲ್ಲ bluetooth HCI ಪ್ಯಾಕೆಟ್‌ಗಳನ್ನು ಸೆರೆಹಿಡಿಯಿರಿ"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM ಅನ್‌ಲಾಕ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"ಬೂಟ್‌ಲೋಡರ್‌ ಅನ್‌ಲಾಕ್‌ ಮಾಡಲು ಅನುಮತಿಸಿ"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"ನಿಮ್ಮ PIN ನಮೂದಿಸಿ"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM ಅನ್‌ಲಾಕ್ ಸಕ್ರಿಯಗೊಳಿಸಲು ನಿಮ್ಮ ಸಾಧನದ PIN ನಮೂದಿಸಿ"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM ಅನ್‌ಲಾಕ್‌ ಮಾಡುವಿಕೆಯನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ಎಚ್ಚರಿಕೆ: ಈ ಸೆಟ್ಟಿಂಗ್‌ ಆನ್‌ ಇರುವಾಗ ಈ ಸಾಧನದಲ್ಲಿ ಸಾಧನ ಸಂರಕ್ಷಣಾ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯ ನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ವೈರ್‌ಲೆಸ್ ಪ್ರದರ್ಶನ ಪ್ರಮಾಣೀಕರಣ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi ವೆರ್ಬೋಸ್ ಲಾಗಿಂಗ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ಸೆಲ್ಯುಲರ್‌ ಹಸ್ತಾಂತರಿಸಲು ಆಕ್ರಮಣಕಾರಿ Wi‑Fi"</string>
@@ -1856,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಸೇರಿಸಿ"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ಸ್ವಯಂಚಾಲಿತ ಪುನಃಸ್ಥಾಪನೆ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಮರುಸ್ಥಾಪಿಸುವಾಗ, ಬ್ಯಾಕ್ ಅಪ್‌ ಮಾಡಲಾದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮರುಸ್ಥಾಪಿಸು"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"ಬ್ಯಾಕಪ್ ಸೇವೆಯು ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ನಿಮ್ಮ ಸಾಧನ ನೀತಿಯ ಮೂಲಕ ಇದನ್ನು ಹೊಂದಿಸಲಾಗುತ್ತದೆ."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ಡೆಸ್ಕ್‌ಟಾಪ್ ಬ್ಯಾಕಪ್ ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ಡೆಸ್ಕ್‌ಟಾಪ್‌‌ನ ಪೂರ್ಣ ಬ್ಯಾಕಪ್‌‌ಗಳನ್ನು ಪ್ರಸ್ತುತ ರಕ್ಷಿಸಲಾಗಿಲ್ಲ"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ಡೆಸ್ಕ್‌ಟಾಪ್‌ನ ಪೂರ್ಣ ಬ್ಯಾಕಪ್‌ಗಳಿಗೆ ಪಾಸ್‌ವರ್ಡ್‌ ಅನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ತೆಗೆದುಹಾಕಲು ಸ್ಪರ್ಶಿಸಿ"</string>
@@ -2011,10 +2001,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ಸ್ಕ್ರೀನ್ ಸಂಯೋಜನೆಗಾಗಿ ಯಾವಾಗಲೂ GPU ಬಳಸಿ"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"ಬಣ್ಣದ ಸ್ಥಳವನ್ನು ಅನುಕರಿಸು"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL ಕುರುಹುಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer (ಬಳಸಬೇಡಿ) ಬಳಸಿ"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"ಅತ್ಯಂತ ಹೆಚ್ಚಿನ ಮಾಧ್ಯಮ ಪ್ಲೇಬ್ಯಾಕ್‌ಗಾಗಿ NuPlayer ಬದಲಿಗೆ AwesomePlayer ಬಳಸಿ"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ಆಡಿಯೋ ರೂಟಿಂಗ್ ನಿಷ್ಕ್ರಿ."</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ಆಡಿಯೊ ಸಲಕರಣೆಗಳಿಗೆ ಸ್ವಯಂ ರೂಟಿಂಗ್ ನಿಷ್ಕ್ರಿಯ."</string>
     <string name="debug_layout" msgid="5981361776594526155">"ಲೇಔಟ್ ಪರಿಮಿತಿಗಳನ್ನು ತೋರಿಸು"</string>
@@ -2325,8 +2313,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"ಸಿಮ್ ಹೆಸರನ್ನು ನಮೂದಿಸಿ"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM ಸ್ಲಾಟ್ %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"ವಾಹಕ"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"ಸಂಖ್ಯೆ"</string>
@@ -2336,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"ನೇರಳೆ"</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>
@@ -2502,7 +2488,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ಲ್ಯಾಂಡ್‌ಸ್ಕೇಪ್ ವೀಕ್ಷಣೆಯಲ್ಲಿ ಉಳಿಯಿರಿ"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ಪ್ರಸ್ತುತ ಓರಿಯಂಟೇಶನ್‌ನಲ್ಲಿ ಉಳಿಯಿರಿ"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI ಮಾಹಿತಿ"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI ಸಂಬಂಧಿತ ಮಾಹಿತಿ"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"ಎನ್‌ಕ್ರಿಪ್ಷನ್"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ಮುಂದುವರಿಸು"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ನೀವು ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸುವ ಮೊದಲು ನಿಮ್ಮ PIN ಅನ್ನು ಪಡೆದುಕೊಳ್ಳುವ ಮೂಲಕ ಅದನ್ನು ಇನ್ನಷ್ಟು ರಕ್ಷಿಸಬಹುದು. ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸುವವರೆಗೂ, ಎಚ್ಚರಿಕೆಗಳು ಸೇರಿದಂತೆ ಇದು ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸುವುದಿಲ್ಲ. \n\nಇದು ಸಾಧನಗಳಲ್ಲಿನ ಕಳೆದುಹೋದ ಅಥವಾ ನಾಶವಾದ ಡೇಟಾವನ್ನು ರಕ್ಷಿಸಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ."</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 8c7ae9f..b962bf2 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -153,7 +153,7 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"항상"</item>
     <item msgid="844721238536786870">"충전 중인 경우에만"</item>
-    <item msgid="1986753720941888596">"절전 모드로 전환 안함"</item>
+    <item msgid="1986753720941888596">"안함"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"항상"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5a2c8d2..d459396 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"연결을 해제하시겠습니까?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 연결이 끊어집니다.&lt;br&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"블루투스 설정을 변경할 권한이 없습니다."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"블루투스 설정이 열려 있는 동안 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>이(가) 주변의 기기에 표시됩니다."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>을(를) 연결 해제하시겠습니까?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"브로드캐스팅"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"프로필을 사용 중지하시겠습니까?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, 블루투스, 비행기 모드, 이동통신망 및 VPN을 관리합니다."</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"셀룰러 데이터"</string>
     <string name="calls_title" msgid="3544471959217176768">"통화"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS 메시지"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"이동통신망 데이터 사용 허용"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"로밍 중 데이터 사용 허용"</string>
     <string name="roaming" msgid="3596055926335478572">"데이터 로밍"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"관리자, 암호화 정책 또는 자격증명 저장소로 인해 사용 중지됨"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"없음"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"스와이프"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"잠금해제 비밀번호 삭제"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"잠금해제 비밀번호 변경"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"음악 및 미디어"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"설정 기억"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi 도우미"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi 도우미를 통해 연결됨"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"화면 전송"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"무선 디스플레이 사용"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"근처에 기기가 없습니다."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi 설정"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"무선 액세스포인트(AP) 설정 및 관리"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi 네트워크 선택"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fi 선택"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi 사용 설정 중..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi 사용 중지 중..."</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"네트워크 항상 검색"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"항상 검색 허용"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi‑Fi가 꺼진 경우에도 Google 위치 서비스 및 기타 앱이 네트워크를 검색하도록 합니다."</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"개방형 Wi‑Fi를 자동으로 사용"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"품질이 우수하다고 확인된 개방형 네트워크에 Wi‑Fi 도우미를 자동으로 연결"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"도우미 선택"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"인증서 설치"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"정확성 개선 등의 목적으로 Google 및 기타 앱이 근처 Wi-Fi 네트워크를 스캔할 수 있습니다. Wi-Fi가 꺼져 있을 때도 작동합니다. 이 기능을 사용하지 않으려면 고급 &gt; 네트워크 항상 검색으로 이동하세요."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"앱이 Wi-Fi가 꺼져 있을 때도 근처 네트워크를 스캔할 수 있습니다. 이 기능을 사용하지 않으려면 고급 &gt; 네트워크 항상 검색으로 이동하세요."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"경고: Wi‑Fi 설정을 건너뛰면 태블릿에서 초기 다운로드와 업데이트에 셀룰러 데이터만 사용합니다. 데이터 요금 부담을 줄이려면 Wi-Fi를 사용하세요."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"경고: Wi‑Fi 설정을 건너뛰면 기기에서 초기 다운로드와 업데이트에 셀룰러 데이터만 사용합니다. 데이터 요금 부담을 줄이려면 Wi-Fi를 사용하세요."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"경고: Wi‑Fi 설정을 건너뛰면 휴대전화에서 초기 다운로드와 업데이트에 셀룰러 데이터만 사용합니다. 데이터 요금 부담을 줄이려면 Wi-Fi를 사용하세요."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Wi‑Fi를 건너뛸 경우:\n\n태블릿이 인터넷에 연결되지 않습니다.\n\n인터넷에 연결할 때까지 소프트웨어 업데이트를 받지 못합니다.\n\n이번에는 기기 보호 기능을 활성화할 수 없습니다."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Wi‑Fi를 건너뛸 경우:\n\n기기가 인터넷에 연결되지 않습니다.\n\n인터넷에 연결할 때까지 소프트웨어 업데이트를 받지 못합니다.\n\n이번에는 기기 보호 기능을 활성화할 수 없습니다."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Wi‑Fi를 건너뛸 경우:\n\n휴대전화가 인터넷에 연결되지 않습니다.\n\n인터넷에 연결할 때까지 소프트웨어 업데이트를 받지 못합니다.\n\n이번에는 기기 보호 기능을 활성화할 수 없습니다."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"해당 태블릿으로 이 Wi-Fi 네트워크에 연결할 수 없습니다."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"해당 기기에서 이 Wi-Fi 네트워크에 연결할 수 없습니다."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"해당 휴대전화로 이 Wi-Fi 네트워크에 연결할 수 없습니다."</string>
@@ -1016,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"공장 초기화하면 태블릿의 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"공장 초기화하면 휴대전화 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"현재 로그인한 계정:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"이 기기에 다른 사용자가 있습니다.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"음악"</li>\n<li>"사진"</li>\n<li>"기타 사용자 데이터"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"USB 저장소"</b>"를 삭제해야 합니다."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"SD 카드"</b>"를 삭제해야 합니다."</string>
@@ -1091,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM 카드를 삽입하고 다시 시작하세요."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"인터넷에 연결하세요."</string>
     <string name="location_title" msgid="1029961368397484576">"사용자 위치"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"직장 프로필"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"직장 프로필 위치"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"회사가 사용 중지했습니다."</string>
     <string name="location_mode_title" msgid="3982009713118421689">"모드"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"높은 정확성"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"배터리 절약"</string>
@@ -1444,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"충전하는 동안 화면이 꺼지지 않음"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"블루투스 HCI 스누프 로그 사용"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"모든 블루투스 HCI 패킷을 하나의 파일에 캡처"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM 잠금 해제"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"부트로더 잠금 해제 허용"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN 입력"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM 잠금 해제를 사용하도록 설정하려면 기기 PIN을 입력하세요."</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM 잠금 해제를 허용하시겠습니까?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"경고: 이 설정을 사용하는 동안에는 이 기기에서 기기 보호 기능이 작동하지 않습니다."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"무선 디스플레이 인증서"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi-Fi 상세 로깅 사용"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi에서 데이터 네트워크로 적극 핸드오버"</string>
@@ -1860,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"앱 데이터 포함"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"자동 복원"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"앱을 다시 설치하면 백업된 설정과 데이터 복원"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"백업 서비스가 비활성 상태입니다."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"기기 정책에 따라 설정되었습니다."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"데스크톱 백업 비밀번호"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"데스크톱 전체 백업에 비밀번호가 설정되어 있지 않음"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"데스크톱 전체 백업에 대한 비밀번호를 변경하거나 삭제하려면 터치하세요."</string>
@@ -2015,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"화면 합성 목적으로 항상 GPU 사용"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"색상 공간 적용"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL 추적 사용 설정"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer 사용(지원 중단됨)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"대부분의 미디어 재생에 NuPlayer 대신 AwesomePlayer 사용"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB 오디오 연결 사용 중지"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB 오디오 주변기기로 자동 연결 사용 중지"</string>
     <string name="debug_layout" msgid="5981361776594526155">"레이아웃 범위 표시"</string>
@@ -2329,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM 이름 입력"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM 슬롯 %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"이동통신사"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"번호"</string>
@@ -2340,7 +2327,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"기타 통화 설정"</string>
@@ -2400,11 +2386,11 @@
     <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_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="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>
@@ -2458,7 +2444,7 @@
     <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_important_category" msgid="8123274463331022993">"중요 소리/진동 알림"</string>
     <string name="zen_mode_downtime_category" msgid="2654477732333340290">"다운타임"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"일"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"없음"</string>
@@ -2476,7 +2462,7 @@
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"주소록에 있는 사용자만"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"별표 표시한 주소록에 있는 사용자만"</string>
     <string name="zen_mode_events" msgid="2456995649835437565">"일정 및 알림"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"알람은 항상 최우선 알림입니다."</string>
+    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"알람은 항상 중요 소리/진동 알림입니다."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"자동 사용 설정"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"사용 안함"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"매일 밤"</string>
@@ -2506,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"가로 보기 유지"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"현재 방향 유지"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI 정보"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI 상대 정보"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"암호화"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"계속"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"기기를 시작할 때 PIN을 입력하도록 설정하면 기기를 보호할 수 있습니다. 기기가 시작되기 전까지 전화, 메시지 및 알람을 포함한 알림을 받을 수 없게 됩니다. \n\n이를 통해 분실 또는 도난된 기기에서 데이터를 보호할 수 있습니다."</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 499ea6f..99a4517 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -206,7 +206,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ажыратылсынбы?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Бул кийинкилер менен болгон байланышты үзөт:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Bluetooth жөндөөлөрүн өзгөртүүгө уруксатыңыз жок."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Bluetooth жөндөөлрү ачылп тургнд жакын арадгы <xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөк көрүнт."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ажыратылсынбы?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Кеңири таратуу"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Профайлды өчүрөсүзбү?"</string>
@@ -456,7 +457,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, Bluetooth, учак режимин, уюктук тармактарды, &amp; VPN\'дерди башкаруу"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Уюктук дайындар"</string>
     <string name="calls_title" msgid="3544471959217176768">"Чалуулар"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS билдирүүлөрү"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Уюктук тармак ичинде дайындарды пайдаланууга мүмкүндүк берүү"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Роуминг учурунда дайындарды пайдаланууга уруксат берүү"</string>
     <!-- no translation found for roaming (3596055926335478572) -->
@@ -606,6 +608,8 @@
     <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
     <skip />
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Коопсуздугу жогору"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <!-- no translation found for unlock_set_unlock_disabled_summary (2120729867788851674) -->
     <skip />
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Жок"</string>
@@ -622,6 +626,8 @@
     <skip />
     <!-- no translation found for unlock_disable_lock_password_summary (192161194564577025) -->
     <skip />
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <!-- no translation found for unlock_change_lock_pattern_title (2044092014872741130) -->
     <skip />
     <!-- no translation found for unlock_change_lock_pin_title (806629901095938484) -->
@@ -829,6 +835,7 @@
     <!-- no translation found for bluetooth_dock_settings_remember (5551459057010609115) -->
     <skip />
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Жардамчысы"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi жардамчысы аркылуу туташып турат"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Сырткы экранга чыгаруу"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Зымсыз дисплейди иштетүү"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Жакын арада эч бир түзмөк табылган жок."</string>
@@ -860,8 +867,7 @@
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <!-- no translation found for wifi_settings_summary (668767638556052820) -->
     <skip />
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi тармагын тандаңыз"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi\'ды тандаңыз"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi жандырылууда…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi өчүрүлүүдө…"</string>
@@ -878,12 +884,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Дайым жеткиликтүүнү скандоо"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Ар дайым иликтей алышсын"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-Fi өчүп турса да, Google\'дун жайгашкан жерди аныктоо кызматына жана башка колдонмолорго тармактарды иликтөөгө мүмкүндүк берүү"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Автоматтык түрдө ачык Wi‑Fi пайдалануу"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Жогорку сапаттуу болуп аныкталган ачык тармктрга Wi‑Fi жардамчысы авт-к түрдө тутшсуна уруксат берүү"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Жардамчы тандоо"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Сертификаттарды орнотуу"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Жайгаштыруунун тактыгын жогорулатуу жана башка максаттарда, Google жана башка колдонмолор, Wi-Fi өчүк болсо да түйүндөрдү скандашы мүмкүн. Эгер сиз муну каалабасаңыз, Илгерилетилген &gt; Скандоо дайым жеткиликтүүгө барыңыз."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Колдонмолор Wi-Fi өчүк болсо да, жакын арадагы түйүндөрдү скандай алышат. Эгер сиз муну каалабасаңыз, Илгерилетилген &gt; Скандоо дайым жеткиликтүүгө барыңыз."</string>
@@ -1005,12 +1008,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ЭСКЕРТҮҮ: Эгер Wi‑Fi\'ды этибарга албай койсоңуз, баштапкы жүктөп алуулар жана жаңыртуулар үчүн планшетиңиз уюктук дайындар тармагын гана колдонот. Акы төлөбөш үчүн, Wi‑Fi\'га туташыңыз."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ЭСКЕРТҮҮ: Эгер Wi‑Fi\'ды этибарга албай койсоңуз, баштапкы жүктөп алуулар жана жаңыртуулар үчүн түзмөгүңүз уюктук дайындар тармагын гана колдонот. Акы төлөбөш үчүн, Wi‑Fi\'га туташыңыз."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ЭСКЕРТҮҮ: Эгер Wi‑Fi\'ды этибарга албай койсоңуз, баштапкы жүктөп алуулар жана жаңыртуулар үчүн телефонуңуз уюктук дайындар тармагын гана колдонот. Акы төлөбөш үчүн, Wi‑Fi\'га туташыңыз."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Эгер Wi‑Fi\'ды өткөрүп жиберсеңиз:\n\nПланшетииңиз Интернетке туташа албайт.\n\nИнтернетке туташмайынча программа жаңыртуулары алынбайт.\n\nБул жолу түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Эгер Wi‑Fi\'ды өткөрүп жиберсеңиз:\n\nТүзмөгүңүз Интернетке туташа албайт.\n\nИнтернетке туташмайынча программа жаңыртуулары алынбайт.\n\nБул жолу түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Эгер Wi‑Fi\'ды өткөрүп жиберсеңиз:\n\nТелефонуңуз Интернетке туташа албайт.\n\nИнтернетке туташмайынча программа жаңыртуулары алынбайт.\n\nБул жолу түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Планшет Wi‑Fi түйүнгө кошула алган жок."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Түзмөк бул Wi‑Fi тармагына туташа алган жок."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефон бул Wi‑Fi түйүнгө кошула алган жок."</string>
@@ -1479,8 +1479,7 @@
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Бул, телефонуңуздун "<b>"ички сактагычындагы"</b>" бардык берилиштерди кийинкилер менен кошо өчүрөт:\n\n"<li>"Сиздин Google эсебиңиз"</li>\n<li>"Систем, колдонмолордун берилиштери жана тууралоолору"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
     <!-- no translation found for master_clear_accounts (6412857499147999073) -->
     <skip />
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Бул түзмөктө башка колдонуучулар бар.\n"</string>
     <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
     <skip />
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Музыканы, сүрөттөрдү, жана башка колдонуучу берилиштерин өчүрүш үчүн, "<b>"USB сактагычты"</b>" тазалаш керек."</string>
@@ -1592,12 +1591,9 @@
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Интернетке кошулуңуз"</string>
     <!-- no translation found for location_title (1029961368397484576) -->
     <skip />
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Жумуш профили"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Жумуш профилинин жайгашкн жери"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Ишканаңыз тарабынан өчүрүлгөн"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Тартип"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Жогорку тактык"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Батарейди үнөмдөө"</string>
@@ -2112,16 +2108,12 @@
     <skip />
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI уруксатсыздарды каттоону иштетүү"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Бардык Bluetooth HCI пакеттерин бир файлга жазуу"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM бөгөттөн чыгаруу"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Кайра жүктөгүчтү бөгөттөн чыгарууга уруксат берүү"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN\'иңизди киргизиңиз"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM кулпуну ачууну иштетүү үчүн түзмөгүңүздүн PIN\'ин киргизиңиз"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM бөгөттөн чыгарууга уруксатпы?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ЭСКЕРТҮҮ: Бул жөндөө күйгүзүлүп турганда түзмөктү коргоо өзгөчөлүктөрү иштебейт."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Зымсыз дисплейди аныктоо"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi дайын-даректүү протоколун иштетүү"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Уюктук хэндоверге өжөр Wi-Fi"</string>
@@ -2652,10 +2644,8 @@
     <!-- no translation found for auto_restore_title (5397528966329126506) -->
     <skip />
     <string name="auto_restore_summary" msgid="4235615056371993807">"Колдонмону кайрадан орнотууда, бэкапталган тууралоолорду жана берилиштерди калыбына келтириңиз"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Камдык көчүрмөнү сактоо кызматы жандырылган эмес."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Бул түзмөгүңүздүн саясаты тарабынан коюлган."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Компүтердеги бэкаптын сырсөзү"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Компүтердеги толук бэкап учурда корголгон эмес"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Тийип, компүтердеги толук бэкаптын сырсөзүн өзгөртүңүз же жок кылыңыз"</string>
@@ -2863,10 +2853,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Экранды калыптоодо ар дайым GPU колдонулсун"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Түс мейкиндигин эмуляциялоо"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL трейстерин иштетүү"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer колдн (сунштлбайт)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Көпчлк медиа ойнт ү-н NuPlayer ордуна AwesomePlayer колдн"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB аудио багыттама өчүр"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Тышкы USB аудио жабдыктарына авто багыттама өчрүү"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Катмардын чектерин көргөзүү"</string>
@@ -3231,8 +3219,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM аталышын киргизиңиз"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM оюкчасы %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Номер"</string>
@@ -3242,7 +3229,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"Башка чалуу жөндөөлөрү"</string>
@@ -3410,7 +3396,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Туурасынан көрүнүштө кала берсин"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Учурдагы багытта кала берсин"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI маалыматы"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI байланыштуу маалымат"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифрлөө"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Улантуу"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Бул түзмөктү иштетүү үчүн PIN\'ди талап кылуу менен, аны коргосоңуз болот. Түзмөк иштетилмейинче чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар алынбайт. \n\nУшуну менен, жоголгон же уурдалган түзмөктөрдөгү дайындар корголот."</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 90afc1d..b8cc72f 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ຕັດການເຊື່ອມຕໍ່ຫຼືບໍ່?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ນີ້ຈະເປັນການຢຸດການເຊື່ອມຕໍ່ຂອງທ່ານກັບ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"ທ່ານ​ບໍ່​ມີ​ສິດ​ອະນຸຍາດ​ໃນ​ການ​ແກ້ໄຂ​ການ​ຕັ້ງຄ່າ Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ສາ​ມາດ​ເບິ່ງ​ເຫັນ​ໄດ້​ໂດຍ​ອຸ​ປະ​ກອນ​ທີ່​ຢູ່​ໃກ້​ຄຽງ​ເມື່ອ​​ເປີດ​ໃຊ້ Blueooth."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"​ຕັດ​ການ​ເຊື່ອມ​ຕ​ໍ່ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ບໍ່?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ການກະ​ຈາຍ​ສັນຍານ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ປິດການນຳໃຊ້ໂປຣໄຟລ໌?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"ຈັດ​ການ Wi‑Fi, Bluetooth, ໂໝດ​ຢູ່​ໃນ​ຍົນ, ເຄືອ​ຂ່າຍ​ມື​ຖື &amp; VPNs"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"​ຂໍ້​ມູນ​ອິນ​ເຕີ​ເນັດ​ມື​ຖື"</string>
     <string name="calls_title" msgid="3544471959217176768">"​​ການ​ໂທ"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"ຂໍ້​ຄວາມ SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"​ອະ​ນຸ​ຍາດ​ໃຫ້​ນຳ​ໃຊ້​ຂໍ້​ມູນ​ຜ່ານ​ເຄືອ​ຂ່າຍ​ໂທ​ລະ​ສັບ"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"​ອະ​ນຸ​ຍາດ​ໃຫ້​ມີ​ການ​ນຳ​ໃຊ້​ຂໍ້​ມູນ​ເມື່ອ​ໂຣມ​ມິງ"</string>
     <string name="roaming" msgid="3596055926335478572">"ການໂຣມມິງຂໍ້ມູນ"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ່ເບິ່ງແຍງລະບົບ, ນະໂຍບາຍການເຂົ້າລະຫັດ ຫຼືບ່ອນເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ບໍ່ໃຊ້"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ປັດ​ໄປ​ຂ້າງ"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"ລຶບລະຫັດປົດລັອກ"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"ປ່ຽນລະຫັດປົດລັອກ"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ສຳລັບເພງ ແລະສື່"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ຈື່ການຕັ້ງຄ່າ"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"ເຊື່ອມ​ຕໍ່​ຜ່ານ Wi‑Fi ຕົວ​ຊ່ວຍ​ແລ້ວ"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"ດຶງໜ້າຈໍ"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ເປີດໃຊ້ງານການສະແດງພາບໄຮ້ສາຍ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ບໍ່ມີອຸປະກອນຢູ່ໃນບໍລິເວນໃກ້ຄຽງ."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"ການຕັ້ງຄ່າ Wi​-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi​-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ຕັ້ງຄ່າ &amp; ຈັດການຈຸດການເຂົ້າໃຊ້ລະບົບໄຮ້ສາຍ"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"ເລືອກ​ເຄືອ​ຂ່າຍ Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"ເລືອກ Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"ກຳລັງເປີດ Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"ກຳລັງປິດ Wi-Fi..."</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ຄຳ​ເຕືອນ: ຫາກ​ທ່ານ​ຂ້າມ Wi‑Fi, ແທັບ​ເລັດຂອງ​ທ່ານ​ຈະ​ໃຊ້​ເພື່ອ​ການ​ເຊື່ອມ​ຕໍ່​ຜ່ານ​ມື​ຖື​ເພື່າອ​ດາວ​ໂຫລດ ແລະ​ອັບ​ເດດ. ເພື່ອ​ປ້ອງ​ກັນ​ການ​​ຮຽກ​ເກັບ​ຄ່າ​ບໍ​ລິ​ການ​​ອິນ​ເຕີ​ເນັດ, ກະ​ລຸ​ນາ​ເຊື່ອມ​ຕໍ່​ຫາ​ເຄືອ​ຂ່າຍ Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ຄຳ​ເຕືອນ: ຫາກ​ທ່ານ​ຂ້າມ Wi‑Fi, ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ໃຊ້​ເພື່ອ​ການ​ເຊື່ອມ​ຕໍ່​ຜ່ານ​ມື​ຖື​ເພື່າອ​ດາວ​ໂຫລດ ແລະ​ອັບ​ເດດ. ເພື່ອ​ປ້ອງ​ກັນ​ການ​​ຮຽກ​ເກັບ​ຄ່າ​ບໍ​ລິ​ການ​​ອິນ​ເຕີ​ເນັດ, ກະ​ລຸ​ນາ​ເຊື່ອມ​ຕໍ່​ຫາ​ເຄືອ​ຂ່າຍ Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ຄຳ​ເຕືອນ: ຫາກ​ທ່ານ​ຂ້າມ Wi‑Fi, ໂທ​ລະ​ສັບຂອງ​ທ່ານ​ຈະ​ໃຊ້​ເພື່ອ​ການ​ເຊື່ອມ​ຕໍ່​ຜ່ານ​ມື​ຖື​ເພື່າອ​ດາວ​ໂຫລດ ແລະ​ອັບ​ເດດ. ເພື່ອ​ປ້ອງ​ກັນ​ການ​​ຮຽກ​ເກັບ​ຄ່າ​ບໍ​ລິ​ການ​​ອິນ​ເຕີ​ເນັດ, ກະ​ລຸ​ນາ​ເຊື່ອມ​ຕໍ່​ຫາ​ເຄືອ​ຂ່າຍ Wi‑Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"ຖ້າ​ທ່ານ​ຂ້າມ Wi‑Fi ໄປ:\n\nແທັບ​ເລັດ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ມີ​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ.\n\n}ທ່ານ​ຈະ​ບໍ່​ເອົາ​ການ​ອັບ​ເດດ​ຊອບແວຣ​ໄດ້ ຈົນ​ກວ່າ​ທ່ານ​ເຊື່ອມ​ຕໍ່​ກັບ​ອິນ​ເຕີ​ເນັດ.\n\nທ່ານ​ບໍ່​ສາ​ມາດ​ເປີດ​ນຳ​ໃຊ້​ຄຸນສົມບັດການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ໄດ້​ໃນ​ເວ​ລາ​ນີ້."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"ຖ້າ​ທ່ານ​ຂ້າມ Wi‑Fi:\n\nອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ມີ​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ.\n\nທ່ານ​ຈະ​ບໍ່​ໄດ້​ຮັບ​ການ​ອັບ​ເດດ​ຊອບແວຣ ຈົນ​ກວ່າ​ທ່ານ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ.\n\nທ່ານ​ບໍ່​ສາ​ມາດ​ເປີດ​ນຳໃຊ້​ຄຸນສົມບັດການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອນ​ໄດ້​ໃນ​ເວ​ລາ​ນີ້."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"ຖ້າ​ທ່ານ​ຂ້າມ Wi‑Fi ໄປ:\n\nໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ມີ​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ.\n\nທ່ານ​ຈະ​ບໍ່​ເອົາ​ການ​ອັບ​ເດດ​ຊອບແວຣ​ໄດ້ ຈົນ​ກວ່າ​ທ່ານ​ເຊື່ອມ​ຕໍ່​ກັບ​ອິນ​ເຕີ​ເນັດ.\n\nທ່ານ​ບໍ່​ສາ​ມາດ​ເປີດ​ນຳ​ໃຊ້​ຄຸນສົມບັດການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ໄດ້​ໃນ​ເວ​ລາ​ນີ້."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ແທັບເລັດບໍ່ສາມາດເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍ Wi-Fi ນີ້ໄດ້."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"ອຸ​ປະ​ກອນບໍ່​ສາ​ມາດ​ເຊື່ອມ​ຕໍ່​ຫາ​ເຄືອ​ຂ່າຍ Wi-Fi ນີ້​ໄດ້."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ໂທລະສັບບໍ່ສາມາດເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍ Wi-Fi ນີ້ໄດ້."</string>
@@ -1087,12 +1090,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"​ໂປຣ​ໄຟລ໌​ບ່ອນ​ເຮັດ​ວຽກ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ຈຸດ​ທີ່​ຕັ້ງ​ສຳ​ລັບ​ໂປ​ຣ​ໄຟ​ລ໌​ບ່ອນ​ເຮັດ​ວຽກ"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"ປິດ​ໂດຍ​ບໍ​ລິ​ສັດ​ຂອງ​ທ່ານ"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"ໂຫມດ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ຄວາມຖືກຕ້ອງສູງ"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ປະຢັດໄຟ"</string>
@@ -1440,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ໜ້າຈໍຈະບໍ່ປິດໃນຂະນະທີ່ສາກໄຟຢູ່"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ເປີດໃຊ້ງານການຊອດແນມ Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ເກັບກຳທຸກແພັກເກັດໃນໄຟລ໌ bluetooth HCI"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"ການ​ປົດ​ລັອກ OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"ອະ​ນຸ​ຍາດ​ໃຫ້​ປົດ​ລັອກ​ບູດ​ໂຫຼດ​ເດີ"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"​ປ້ອນ​ລະ​ຫັດ​ PIN ຂອງ​ທ່ານ"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"​ປ້ອນ​ລະ​ຫັດ PIN ​ຂອງ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ເພື່ອ​ເປີດ​ນຳ​ໃຊ້​ການ​ປົດ​ລັອກ OEM"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"ອະ​ນຸ​ຍາດ​ການ​ປົກ​ລັອກ OEM ບໍ?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ຄຳ​ເຕືອນ: ຄຸນ​ສົມ​ບັດ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອນ​ຈະ​ບໍ່​ເຮັດ​ວຽກຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ນີ້ ໃນ​ຂະ​ນະ​ທີ່​ການ​ຕັ້ງ​ຄ່ານີ້​ເປີດ​ຢູ່."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ສະແດງການຮັບຮອງຂອງລະບົບໄຮ້ສາຍ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"​ເປີດ​ນຳ​ໃຊ້ການ​ເກັບ​ປະ​ຫວັດ​ Verbose Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ໃຫ້​ບຸລິມະສິດ​ການ​ປ່ຽນ​ຈາກ Wi-Fi ເປັນ​ເຄືອ​​ຂ່າຍ​ໂທ​ລະ​ສັບ"</string>
@@ -1856,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"​ຮວມ​ຂໍ້​ມູນ​ແອັບຯ"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ການກູ້ຂໍ້ມູນອັດຕະໂນມັດ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"ເມື່ອຕິດຕັ້ງແອັບຯໃດນຶ່ງຄືນໃໝ່, ໃຫ້ໃຊ້ການຕັ້ງຄ່າ ແລະຂໍ້ມູນທີ່ເຄີຍສຳຮອງໄວ້"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"ການ​ບໍ​ລິ​ການ​ສຳຮອງຂໍ້ມູນ​ບໍ່ເປີດໃຊ້."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ອັນ​ນີ້​ຖືກ​ຕັ້ງ​ໂດຍ​ນະ​ໂຍ​ບາຍ​ຂອງອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ລະຫັດຜ່ານການສຳຮອງຂໍ້ມູນເດັກສະທັອບ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ການ​ສຳຮອງ​ຂໍ້ມູນ​ເຕັມຮູບແບບ​ໃນ​ເດັກສະທັອບ​ຍັງ​ບໍ່​ໄດ້​ຮັບ​ການ​ປ້ອງກັນ​ໃນ​ເວລາ​ນີ້"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ແຕະເພື່ອປ່ຽນ ຫຼືລຶບລະຫັດຂອງການສຳຮອງຂໍ້ມູນເຕັມຮູບແບບໃນເດັກສະທັອບ"</string>
@@ -2011,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ໃຊ້ GPU ໃນການວາງອົງປະກອບໜ້າຈໍສະເໝີ"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"ຈຳລອງ color space"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"ເປີດການໃຊ້ຮ່ອງຮອຍໃນ OpenGL"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"ໃຊ້ AwesomePlayer (ບໍ່​ເຫັນ​ດີ)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"ໃຊ້ AwesomePlayer ແທນ NuPlayer ສຳ​ລັບ​ການ​ຫຼິ້ນ​ມີ​ເດຍ​ຄືນ​ສ່ວນ​ໃຫຍ່"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"ປິດ​ການ​ນຳ​ໃຊ້​ເສັ້ນ​ທາງ​ສຽງ USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"ປິດ​​ການ​ນຳ​ໃຊ້​ເສັ້ນ​ທາງ​​ອັດ​ຕະ​ໂນ​ມັດ​ໄປ​ຫາອຸ​ປະ​ກອ​ນ​ຕໍ່​ພ່ວງ​ສຽງ​ USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"ສະແດງຂອບການຈັດວາງ"</string>
@@ -2325,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"ປ້ອນ​ຊື່ SIM ເຂົ້​າ​ໄປ"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"ຊ່ອງ​ຊິມ %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"​ຜູ່​ໃຫ້​ບໍ​ລິ​ການ"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"ໝາຍເລກ"</string>
@@ -2336,7 +2327,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"ການຕັ້ງຄ່າການໂທອື່ນໆ"</string>
@@ -2502,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ໃຊ້​ທິດທາງ​ລວງ​ນອນ"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ໃຊ້ທິດທາງ​ປັດຈຸບັນ​ຂອງ​ໜ້າ​ຈໍ"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"ຂໍ້ມູນ IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"ຂໍ້ມູນ​ກ່ຽວ​ຂ້ອງ​ກັບ IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"ການເຂົ້າລະຫັດ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ດຳເນີນການຕໍ່"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ທ່ານ​ສາ​ມາດ​ເສີມ​ການ​ປ້ອງ​ກັນ​ໃຫ້​ອຸ​ປະ​ກອນ​ນີ້​ໄດ້ ໂດຍ​ການ​ບັງ​ຄັບ​ໃຫ້​ໃສ່​ລະ​ຫັດ PIN ​ກ່ອນ​ເປີດ​ໃຊ້. ​ກ່ອນ​ການ​ເປີດ​ໃຊ້, ອຸ​ປະ​ກອນ​ຈະ​ບໍ່​ສາ​ມາດຮັບ​ໂທ​ລະ​ສັບ, ຂໍ້​ຄວາມ ຫຼື ການ​ແຈ້ງ​ເຕືອນ ຮວມ​ເຖິງ​ໂມງ​ປຸກ​ໄດ້. \n\n​ມັນ​ຈະ​ຊ່ວຍ​ປ້ອງ​ການ​ການ​ສູນ​ເສຍ​ຂໍ້​ມູນ​ຫາກ​ອຸ​ປະ​ກອນ​ສູນ​ຫາຍ ຫຼື ຖືກ​ລັກ."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 846743c..3252093 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Atsijungti?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tai nutrauks ryšį su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Neturite leidimo keisti „Bluetooth“ nustatymų."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ matomas netol. esant. įreng., kai atidar. „Bluetooth“ nustat."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Atjungti „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transliavimas"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Neleisti profilio?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Tvarkykite „Wi‑Fi“, „Bluetooth“, lėktuvo režimą, korinius tinklus ir VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Korinio ryšio duomenys"</string>
     <string name="calls_title" msgid="3544471959217176768">"Skambučiai"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS pranešimai"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Leisti duomenų naudojimą koriniu tinklu"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Leisti duom. naud. tarp. ryš."</string>
     <string name="roaming" msgid="3596055926335478572">"Tarptinklinis duomenų ryšys"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Vidutinis–aukštas saugos lygis"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Slaptažodis"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Aukštas saugos lygis"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Neleido: administr., šifrav. polit. ar įgalioj. atmint."</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nėra"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Perbraukti"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Pašalinti atrakinimo modelį"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Pašalinti atrakinimo PIN kodą"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Pašalinti atrakinimo slaptažodį"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Keisti atrakinimo modelį"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Pakeisti atrakinimo PIN kodą"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Pakeisti atrakinimo slaptažodį"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muzikai ir medijai"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Atsiminti nustatymus"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"„Wi‑Fi“ pagelbiklis"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Prisijungta naudojant „Wi‑Fi“ pagelbiklį"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Perduoti ekraną"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Įgalinti belaidį rodymą"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nerasta netoliese esančių įrenginių."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"„Wi-Fi“ nustatymai"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Nustatyti ir valdyti bevielius prieigos taškus"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Pasirinkti „Wi‑Fi“ tinklą"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Pasirinkti „Wi-Fi“"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"„Wi-Fi“ įjungiama…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"„Wi-Fi“ išjungiama…"</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ĮSPĖJIMAS: jei praleisite prisijungimo prie „Wi-Fi“ veiksmą, planšetiniame kompiuteryje pradiniams atsisiuntimams ir naujiniams bus naudojami tik mobiliojo ryšio duomenys. Kad išvengtumėte galimų duomenų mokesčių, prisijunkite prie „Wi‑Fi“."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ĮSPĖJIMAS: jei praleisite prisijungimo prie „Wi-Fi“ veiksmą, įrenginyje pradiniams atsisiuntimams ir naujiniams bus naudojami tik mobiliojo ryšio duomenys. Kad išvengtumėte galimų duomenų mokesčių, prisijunkite prie „Wi‑Fi“."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ĮSPĖJIMAS: jei praleisite prisijungimo prie „Wi-Fi“ veiksmą, telefone pradiniams atsisiuntimams ir naujiniams bus naudojami tik mobiliojo ryšio duomenys. Kad išvengtumėte galimų duomenų mokesčių, prisijunkite prie „Wi‑Fi“."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Jei praleisite „Wi‑Fi“:\n\nPlanšetiniame kompiuteryje nebus interneto ryšio.\n\nNegausite programinės įrangos naujinių, kol prisijungsite prie interneto.\n\nŠiuo metu negalėsite suaktyvinti įrenginio apsaugos funkcijų."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Jei praleisite „Wi‑Fi“:\n\nĮrenginyje nebus interneto ryšio.\n\nNegausite programinės įrangos naujinių, kol prisijungsite prie interneto.\n\nŠiuo metu negalėsite suaktyvinti įrenginio apsaugos funkcijų."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Jei praleisite „Wi‑Fi“:\n\nTelefone nebus interneto ryšio.\n\nNegausite programinės įrangos naujinių, kol prisijungsite prie interneto.\n\nŠiuo metu negalėsite suaktyvinti įrenginio apsaugos funkcijų."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Planšetiniam kompiuteriui nepavyko prisijungti prie šio „Wi-Fi“ tinklo."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Įrenginiui nepavyko prisijungti prie šio „Wi-Fi“ tinklo."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonui nepavyko prisijungti prie šio „Wi-Fi“ tinklo."</string>
@@ -1087,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Įdėkite SIM kortelę ir paleiskite iš naujo"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Prisijunkite prie interneto"</string>
     <string name="location_title" msgid="1029961368397484576">"Mano vieta"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Darbo profilis"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Darbo profilio vieta"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Išjungė jūsų įmonė"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Režimas"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Didelis tikslumas"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Akumuliatoriaus tausojimas"</string>
@@ -1734,7 +1734,7 @@
     <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Išsaugota talpykloje"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Balso įvestis ir išvestis"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Balso įvesties ir išvesties nustatymai"</string>
-    <string name="voice_search_settings_title" msgid="2775469246913196536">"Balso paieška"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"Paieška balsu"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"„Android“ klaviatūra"</string>
     <string name="voice_category" msgid="1430370497125803904">"Kalba"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Įvesties balsu nustatymai"</string>
@@ -1852,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Įtraukti programos duomenis"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatinis atkūrimas"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Iš naujo įdiegdami programą atkurkite nustatymus ir duomenis, kurių atsarginės kopijos buvo sukurtos"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Atsarginio kopijavimo paslauga neaktyvi."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Tai nustatyta vadovaujantis įrenginio politika."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Viet. atsrg. kop. slapt."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Šiuo metu visos vietinės atsarginės kopijos neapsaugotos"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Jei norite pakeisti ar pašalinti visų vietinių atsarginių kopijų slaptažodį, palieskite"</string>
@@ -2319,8 +2317,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM Nr. <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM tuščia"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM pavadinimas"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Įveskite SIM kortelės pavadinimą"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM lizdas %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operatorius"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numeris"</string>
@@ -2330,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Purpurinė"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nėra SIM kortelės"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM būsena"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Su SIM susijusi informacija"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Atgalinis skambinimas iš numatytosios SIM"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM išsiunčiamiesiems skambučiams"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Kiti skambučio nustatymai"</string>
@@ -2496,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI informacija"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI susijusi informacija"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Šifruotė"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Tęsti"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Galite papildomai apsaugoti įrenginį reikalaudami PIN kodo prieš jį paleidžiant. Kol įrenginys nepaleistas, negalima gauti skambučių ar pranešimų, įskaitant įspėjimus. \n\nTai padeda apsaugoti prarastų arba pavogtų įrenginių duomenis."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b0c5970..1a89073 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vai pārtraukt savienojumu?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tiks pārtraukts savienojums ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Jums nav atļaujas mainīt Bluetooth iestatījumus."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Kamēr Bluetooth iestatījumi atvērti, ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ir redzama citām ierīcēm tuvumā."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vai atvienot <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Apraidīšana"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vai atspējot profilu?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi-Fi, Bluetooth, lidojuma režīma, mobilo tīklu un VPN pārvaldība"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobilie dati"</string>
     <string name="calls_title" msgid="3544471959217176768">"Zvani"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Īsziņas"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Atļaut datu izmantošanu mobilajā tīklā"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Datu lietojums viesabonēšanā"</string>
     <string name="roaming" msgid="3596055926335478572">"Datu viesabonēšana"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Vidējs līdz augsts drošības līmenis"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parole"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Augsts drošības līmenis"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Atspēj. admin., šifr. polit. vai akred. datu krāt."</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nav"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Vilkt"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Noņemt atbloķēšanas kombināciju"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Noņemt atbloķēšanas PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Noņemt atbloķēšanas paroli"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Atbloķēšanas kombinācijas maiņa"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mainīt atbloķēšanas PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mainīt atbloķēšanas paroli"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Mūzikai un multividei"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Iegaumēt iestatījumus"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Izveidots savienojums ar Wi‑Fi palīgu"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Apraides ekrāns"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Bezvadu attēlošanas iespējošana"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tuvumā nav atrasta neviena ierīce."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi iestatījumi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Bezvadu piekļuves punktu iestatīšana un pārvaldība"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi tīkla atlase"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Atlasīt Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Notiek Wi-Fi ieslēgšana..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Notiek Wi-Fi izslēgšana..."</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"BRĪDINĀJUMS. Ja izlaidīsiet Wi‑Fi savienojuma izveidi, sākotnējām lejupielādēm un atjauninājumiem planšetdators izmantos tikai mobilos datus. Lai izvairītos no iespējamās maksas par datu izmantošanu, izveidojiet Wi‑Fi savienojumu."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"BRĪDINĀJUMS. Ja izlaidīsiet Wi‑Fi savienojuma izveidi, sākotnējām lejupielādēm un atjauninājumiem ierīce izmantos tikai mobilos datus. Lai izvairītos no iespējamās maksas par datu izmantošanu, izveidojiet Wi-Fi savienojumu."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"BRĪDINĀJUMS. Ja izlaidīsiet Wi‑Fi savienojuma izveidi, sākotnējām lejupielādēm un atjauninājumiem tālrunis izmantos tikai mobilos datus. Lai izvairītos no iespējamās maksas par datu izmantošanu, izveidojiet Wi‑Fi savienojumu."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ja neizmantojat Wi‑Fi savienojumu:\n\nJūsu planšetdatorā nebūs interneta savienojuma.\n\nKamēr nebūs izveidots savienojums ar internetu, nesaņemsiet programmatūras atjauninājumus.\n\nPašlaik nevar aktivizēt ierīces aizsardzības funkcijas."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ja neizmantojat Wi‑Fi savienojumu:\n\nJūsu ierīcē nebūs interneta savienojuma.\n\nKamēr nebūs izveidots savienojums ar internetu, nesaņemsiet programmatūras atjauninājumus.\n\nPašlaik nevar aktivizēt ierīces aizsardzības funkcijas."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ja neizmantojat Wi‑Fi savienojumu:\n\nJūsu tālrunī nebūs interneta savienojuma.\n\nKamēr nebūs izveidots savienojums ar internetu, nesaņemsiet programmatūras atjauninājumus.\n\nPašlaik nevar aktivizēt ierīces aizsardzības funkcijas."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Planšetdatorā nevarēja izveidot savienojumu ar Wi-Fi tīklu."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Ierīcē nevarēja izveidot savienojumu ar Wi-Fi tīklu."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Tālrunī nevarēja izveidot savienojumu ar Wi-Fi tīklu."</string>
@@ -1087,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Lūdzu, ievietojiet SIM karti un restartējiet."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Lūdzu, izveidojiet savienojumu ar internetu."</string>
     <string name="location_title" msgid="1029961368397484576">"Mana atrašanās vieta"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Darba profils"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Darba profila atrašanās vieta"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Izslēdza jūsu uzņēmums"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Režīms"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Augsta precizitāte"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Akumulatora jaudas taupīšana"</string>
@@ -1852,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Lietotņu datu iekļaušana"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automātiska atjaunošana"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Atkārtoti instalējot lietotni, atjaunot dublētos iestatījumus un datus"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Dublēšanas pakalpojums nav aktīvs."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Šo iestata ierīces politika."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Datora dublējuma parole"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Darbvirsmas pilnie dublējumi pašlaik nav aizsargāti."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Pieskarieties, lai mainītu vai noņemtu paroli pilniem darbvirsmas dublējumiem."</string>
@@ -2319,8 +2317,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM karte <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM karte ir tukša"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM kartes nosaukums"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Ievadiet SIM nosaukumu"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM kartes slots: %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Mobilo sakaru operators"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numurs"</string>
@@ -2330,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Violeta"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nav ievietota neviena SIM karte."</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM kartes statuss"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Ar SIM saistīta informācija"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Atzvanīšana no noklusējuma SIM kartes"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM karte izejošajiem zvaniem"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Citi zvanu iestatījumi"</string>
@@ -2496,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI informācija"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Ar IMEI saistīta informācija"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Šifrējums"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Turpināt"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Varat uzlabot šīs ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīts PIN. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus vai paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība pazaudētās vai nozagtās ierīcēs."</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index d60951d..1806ff4 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Исклучи?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ова ќе ја прекине вашата врска со:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Немате дозвола за промена на поставките на Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> е видлив кога се отворени Поставки за Bluetooth."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> е видлив за уредите во близина кога се отворени Поставки за Bluetooth."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Исклучи <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Емитување"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Оневозможи профил?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Управувајте со Wi‑Fi, Bluetooth, режим на летање со авион, мобилни мрежи и ВПН-мрежи"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Мобилни податоци"</string>
     <string name="calls_title" msgid="3544471959217176768">"Повици"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"СМС-пораки"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"СМС-пораки"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Дозв. корист. подат. преку мобилна мрежа"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Дозв. корист. подат. во роам."</string>
     <string name="roaming" msgid="3596055926335478572">"Роаминг на податоци"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Средно до високо ниво на безбедност"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Лозинка"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Високо ниво на безбедност"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Карактеристиките за заштита на уредот повеќе нема да работат."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Оневозм. од админ., шифрир. или мемо. за акредит."</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ниедна"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Повлечи"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Отстрани шема на отклучување"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Отстрани ПИН за отклучување"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Отстрани лозинка за отклучување"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Отстрани заклучување на екранот"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Смени шема на отклуч."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промени ПИН за отклучување"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Смени лозинка за откл."</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"За музика и медиуми"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомни подесувања"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Помошник за Wi‑Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Поврзано преку помошник за Wi-Fismile"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Префрли екран"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Овозможи приказ на безжични мрежи"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Не се пронајдени уреди во близина."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Подесувања за Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Постави и управувај со безжични пристапни точки"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Изберете Wi-Fi мрежа"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Избери Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Вклучување на Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Исклучување на Wi-Fi..."</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ПРЕДУПРЕДУВАЊЕ: Ако прескокнете Wi‑Fi, таблетот ќе користи само мобилни податоци за првични преземања или ажурирања. За да избегнете можни трошоци за податоци, поврзете се на Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ПРЕДУПРЕДУВАЊЕ: Ако прескокнете Wi‑Fi, уредот ќе користи само мобилни податоци за првични преземања или ажурирања. За да избегнете можни трошоци за податоци, поврзете се на Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ПРЕДУПРЕДУВАЊЕ: Ако прескокнете Wi‑Fi, телефонот ќе користи само мобилни податоци за првични преземања или ажурирања. За да избегнете можни трошоци за податоци, поврзете се на Wi‑Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Доколку го прескокнете Wi‑Fi:\n\nТаблетот нема да има интернет-поврзување.\n\nНема да добивате софтверски ажурирања сѐ додека не се поврзете на интернет.\n\nВо моментов, не може да ги активирате функциите за заштита на уредот."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Доколку го прескокнете Wi‑Fi:\n\nУредот нема да има интернет-поврзување.\n\nНема да добивате софтверски ажурирања сѐ додека не се поврзете на интернет.\n\nВо моментов, не може да ги активирате функциите за заштита на уредот."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Доколку го прескокнете Wi‑Fi:\n\nТелефонот нема да има интернет-поврзување.\n\nНема да добивате софтверски ажурирања сѐ додека не се поврзете на интернет.\n\nВо моментов, не може да ги активирате функциите за заштита на уредот."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Таблетот не можеше да се поврзете со оваа Wi-Fi мрежа."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Уредот не можеше да се поврзе на оваа мрежа на Wi‑Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефонот не можеше да се поврзе со оваа Wi-Fi мрежа."</string>
@@ -1087,12 +1086,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Работен профил"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Локација за работен профил"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Исклучено од вашата компанија"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Голема прецизност"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Заштеда на батерија"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Опфати податоци за апликација"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автоматско враќање"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"При инсталирање апликација, обнови снимени подесувања и податоци"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Услугата Резервна копија не е активна."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ова е поставено од правилата на уредот."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Резервна лозинка за работна површина"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Целосни резервни копии на работната површина кои во моментов не се заштитени"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Допрете за да се промени или отстрани лозинката за целосна резервна копија на работната површина"</string>
@@ -2319,8 +2313,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Внесете име на СИМ"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Отвор за СИМ-картичка %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Број"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Виолетова"</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>
@@ -2496,7 +2488,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Остани во приказ на пејзаж"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Остани во тековната ориентација"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Информации за IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Информации во врска со IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифрирање"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Продолжи"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Може дополнително да го заштитите уредот ако го побарате ПИН-кодот пред да се стартува. Сè додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди."</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 050cbbf..bf3dd7c 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"വിച്ഛേദിക്കണോ?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ഇത് ഇനിപ്പറയുന്നതുമായുള്ള നിങ്ങളുടെ കണക്ഷൻ അവസാനിപ്പിക്കും:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"ബ്ലൂടൂത്ത് ക്രമീകരണങ്ങൾ മാറ്റാൻ നിങ്ങൾക്ക് അനുമതിയില്ല."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ബ്ലൂടൂത്ത് ക്രമീകരണങ്ങൾ തുറന്നിരിക്കുമ്പോൾ സമീപമുള്ള ഉപകരണങ്ങൾക്ക് <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ദൃശ്യമാകുന്നു."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> വിച്ഛേദിക്കണോ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"പ്രക്ഷേപണം ചെയ്യുന്നു"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"പ്രൊഫൈൽ പ്രവർത്തനരഹിതമാക്കണോ?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"വൈഫൈ, ബ്ലൂടൂത്ത്, ഫ്ലൈറ്റ് മോഡ്, സെല്ലുലാർ നെറ്റ്‌വർക്കുകൾ, VPN-കൾ എന്നിവ നിയന്ത്രിക്കുക"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"സെല്ലുലാർ ഡാറ്റ"</string>
     <string name="calls_title" msgid="3544471959217176768">"കോളുകൾ"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS സന്ദേശങ്ങൾ"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"സെല്ലുലാർ നെറ്റ്‌വർക്കിലൂടെ ഡാറ്റ ഉപയോഗം അനുവദിക്കുക"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"റോമിംഗിലുള്ളപ്പോൾ ഡാറ്റ ഉപയോഗം അനുവദിക്കുക"</string>
     <string name="roaming" msgid="3596055926335478572">"ഡാറ്റ റോമിംഗ്"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"അഡ്‌മിനിസ്‌ട്രേറ്ററോ എൻക്രിപ്‌ഷൻ നയം അല്ലെങ്കിൽ ക്രെഡൻഷ്യൽ സംഭരണം ഉപയോഗിച്ചോ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ഒന്നുമില്ല"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"സ്വൈപ്പുചെയ്യുക"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"അൺലോക്ക് പാറ്റേൺ നീക്കംചെയ്യുക"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"അൺലോക്ക് പിൻ നീക്കംചെയ്യുക"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"അൺലോക്ക് പാസ്‌വേഡ് നീക്കംചെയ്യുക"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"അൺലോക്ക് പാറ്റേൺ മാറ്റുക"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"അൺലോക്ക് പിൻ മാറ്റുക"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"അൺലോക്ക് പാസ്‌വേഡ് മാറ്റുക"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"സംഗീതം, മീഡിയ എന്നിവയ്‌ക്കായി"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ക്രമീകരണങ്ങൾ ഓർമ്മിക്കുക"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi അസിസ്‌റ്റന്റ്"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi അസിസ്റ്റന്റ് മുഖേന കണക്‌റ്റുചെയ്തു"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"കാസ്‌റ്റ് സ്‌ക്രീൻ"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"വയർലെസ് ഡിസ്പ്ലേ പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"സമീപത്തുള്ള ഉപകരണങ്ങളൊന്നും കണ്ടെത്തിയില്ല."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi ക്രമീകരണങ്ങൾ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"വയർലെസ് ആക്‌സസ് പോയിന്റുകൾ സജ്ജീകരിക്കുക, നിയന്ത്രിക്കുക"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi നെറ്റ്‌വർക്ക് തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi ഓണാക്കുന്നു…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi ഓഫാക്കുന്നു…"</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"മുന്നറിയിപ്പ്: Wi‑Fi ഒഴിവാക്കുകയാണെങ്കിൽ, നിങ്ങളുടെ ടാബ്‌ലെറ്റ് പ്രാരംഭ ഡൗൺലോഡുകൾക്കും അപ്‌ഡേറ്റുകൾക്കും സെല്ലുലാർ ഡാറ്റ മാത്രം ഉപയോഗിക്കും. സാധ്യമായ ഡാറ്റ നിരക്കുകൾ ഒഴിവാക്കുന്നതിന് Wi‑Fi-മായി കണക്‌റ്റുചെയ്യുക."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"മുന്നറിയിപ്പ്: Wi‑Fi ഒഴിവാക്കുകയാണെങ്കിൽ, നിങ്ങളുടെ ഉപകരണം പ്രാരംഭ ഡൗൺലോഡുകൾക്കും അപ്‌ഡേറ്റുകൾക്കും സെല്ലുലാർ ഡാറ്റ മാത്രം ഉപയോഗിക്കും. സാധ്യമായ ഡാറ്റ നിരക്കുകൾ ഒഴിവാക്കുന്നതിന് Wi‑Fi-മായി കണക്‌റ്റുചെയ്യുക."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"മുന്നറിയിപ്പ്: Wi‑Fi ഒഴിവാക്കുകയാണെങ്കിൽ, നിങ്ങളുടെ ഫോൺ പ്രാരംഭ ഡൗൺലോഡുകൾക്കും അപ്‌ഡേറ്റുകൾക്കും സെല്ലുലാർ ഡാറ്റ മാത്രം ഉപയോഗിക്കും. സാധ്യമായ ഡാറ്റ നിരക്കുകൾ ഒഴിവാക്കുന്നതിന് Wi‑Fi-മായി കണക്‌റ്റുചെയ്യുക."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"നിങ്ങൾ Wi‑Fi ഒഴിവാക്കുകയാണെങ്കിൽ:\n\nനിങ്ങളുടെ ടാബ്‌ലെറ്റിന് ഇന്റർനെറ്റ് കണക്ഷൻ ഉണ്ടാകില്ല.\n\n ഇന്റർനെറ്റിലേക്ക് കണക്‌റ്റുചെയ്യുന്നതുവരെ, സോഫ്‌റ്റ്‌വെയർ അപ്‌ഡേറ്റുകൾ ലഭിക്കില്ല.\n\nഇപ്പോൾ നിങ്ങൾക്ക് ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കാനാവില്ല."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"നിങ്ങൾ Wi‑Fi ഒഴിവാക്കുകയാണെങ്കിൽ:\n\nനിങ്ങളുടെ ഉപകരണത്തിന് ഇന്റർനെറ്റ് കണക്ഷൻ ഉണ്ടാകില്ല.\n\n ഇന്റർനെറ്റിലേക്ക് കണക്‌റ്റുചെയ്യുന്നതുവരെ സോഫ്‌റ്റ്‌വെയർ അപ്‌ഡേറ്റുകൾ ലഭിക്കില്ല.\n\nഇപ്പോൾ നിങ്ങൾക്ക് ഉപകരണ പരിരക്ഷ ഫീച്ചറുകൾ സജീവമാക്കാനാവില്ല."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"നിങ്ങൾ Wi‑Fi ഒഴിവാക്കുകയാണെങ്കിൽ:\n\nനിങ്ങളുടെ ഫോണിന് ഇന്റർനെറ്റ് കണക്ഷൻ ഉണ്ടാകില്ല.\n\nഇന്റർനെറ്റിലേക്ക് കണക്‌റ്റുചെയ്യുന്നതുവരെ സോഫ്‌റ്റ്‌വെയർ അപ്‌ഡേറ്റുകൾ ലഭിക്കില്ല.\n\nഇപ്പോൾ നിങ്ങൾക്ക് ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കാനാവില്ല."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ഈ Wi‑Fi നെറ്റ്‌വർക്കിൽ കണക്റ്റുചെയ്യാൻ ടാബ്‌ലെറ്റിനായില്ല."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"ഈ Wi‑Fi നെറ്റ്‌വർക്കിലേക്ക് ഉപകരണം കണക്‌റ്റുചെയ്യാനായില്ല."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ഫോൺ ഈ Wi‑Fi നെറ്റ്‌വർക്കിൽ കണക്റ്റുചെയ്യാനായില്ല."</string>
@@ -1087,12 +1090,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ഔദ്യോഗിക പ്രൊഫൈലിനായുള്ള ലൊക്കേഷൻ"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"നിങ്ങളുടെ കമ്പനി ഓഫുചെയ്‌തു"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"മോഡ്"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ഉയർന്ന കൃത്യത"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ബാറ്ററി ലാഭിക്കൽ"</string>
@@ -1440,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ചാർജ്ജുചെയ്യുമ്പോൾ സ്‌ക്രീൻ ഒരിക്കലും സുഷുപ്തിയിലാകില്ല"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ബ്ലൂടൂത്ത് HCI സ്‌നൂപ്പ് ലോഗ് പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ഒരു ഫയലിൽ എല്ലാ ബ്ലൂടൂത്ത് HCI പാക്കറ്റുകളും ക്യാപ്‌ചർ ചെയ്യുക"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM അൺലോക്കുചെയ്യൽ"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"അൺലോക്കാകാൻ ബൂട്ട്‌ലോഡറിനെ അനുവദിക്കുക"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"നിങ്ങളുടെ PIN നൽകുക"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM അൺലോക്ക് പ്രവർത്തനക്ഷമമാക്കുന്നതിന് നിങ്ങളുടെ ഉപകരണത്തിന്റെ PIN നൽകുക"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM അൺലോക്കുചെയ്യൽ അനുവദിക്കണോ?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"മുന്നറിയിപ്പ്: ഈ ക്രമീകരണം ഓണായിരിക്കുമ്പോൾ, ഉപകരണ സുരക്ഷാ ഫീച്ചറുകൾ ഈ ഉപകരണത്തിൽ പ്രവർത്തിക്കില്ല."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"വയർലെസ് ഡിസ്‌പ്ലേ സർട്ടിഫിക്കേഷൻ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi വെർബോസ് ലോഗിംഗ് പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"സെല്ലുലാർ ഹാൻഡ്ഓവറിലേക്ക് വൈഫൈ അഗ്രസ്സീവാക്കുക"</string>
@@ -1856,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"അപ്ലിക്കേഷൻ ഡാറ്റ ഉൾപ്പെടുത്തുക"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"യാന്ത്രികമായി പുനഃസ്ഥാപിക്കൽ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"ഒരു അപ്ലിക്കേഷൻ വീണ്ടും ഇൻസ്റ്റാൾ ചെയ്യുമ്പോൾ, ബാക്കപ്പുചെയ്‌ത ക്രമീകരണങ്ങളും ഡാറ്റയും പുനഃസ്ഥാപിക്കുക"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"ബാക്കപ്പ് സേവനം നിർജ്ജീവമാണ്."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ഇത് നിങ്ങളുടെ ഉപകരണ നയം സജ്ജീകരിച്ചതാണ്."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ഡെ‌സ്‌ക്ടോപ്പ് ബാക്കപ്പ് പാസ്‌വേഡ്"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ഡെസ്‌ക്‌ടോപ്പ് പൂർണ്ണ ബാക്കപ്പുകൾ നിലവിൽ പരിരക്ഷിച്ചിട്ടില്ല"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ഡെസ്‌ക്‌ടോപ്പ് പൂർണ്ണ ബാക്കപ്പുകൾക്കായി പാസ്‌വേഡുകൾ മാറ്റാനോ നീക്കംചെയ്യാനോ സ്‌പർശിക്കുക"</string>
@@ -2011,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"സ്‌ക്രീൻ കമ്പോസിറ്റുചെയ്യലിനായി എല്ലായ്‌പ്പോഴും GPU ഉപയോഗിക്കുക"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"വർണ്ണ സ്‌പെയ്‌സ് അനുകരിക്കുക"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL ട്രെയ്‌സുകൾ പ്രവർത്തനക്ഷമമാക്കുക"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer ഉപയോഗിക്കുക (ഒഴിവാക്കിയത്)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"ഏറ്റവും മികച്ച മീഡിയ പ്ലേബാക്കിനായി NuPlayer-നുപകരം AwesomePlayer ഉപയോഗിക്കുക"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ഓഡിയോ റൂട്ടിംഗ് പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ഓഡിയോ പെരിഫറലുകളിലേക്കുള്ള യാന്ത്രിക റൂട്ടിംഗ് പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="debug_layout" msgid="5981361776594526155">"ലേഔട്ട് ബൗണ്ടുകൾ ദൃശ്യമാക്കുക"</string>
@@ -2325,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM പേര് നൽകുക"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM സ്‌ലോട്ട് %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"കാരിയര്‍"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"നമ്പർ"</string>
@@ -2336,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"പര്‍പ്പിള്‍"</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>
@@ -2502,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ലാൻഡ്‌സ്‌കേപ്പ് കാഴ്‌ചയിൽ തുടരുക"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"നിലവിലുള്ള ഓറിയന്റേഷനിൽ തുടരുക"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI വിവരങ്ങൾ"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI അനുബന്ധ വിവരങ്ങൾ"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"എൻ‌ക്രിപ്ഷൻ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"തുടരുക"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ഉപകരണം ആരംഭിക്കുന്നതിനു‌മുമ്പ്, നിങ്ങളുടെ PIN ആവശ്യമായി വരുന്നതിനാൽ ഇത് തുടർന്നും പരിരക്ഷിക്കാനാകും. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, ഇതിന് അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടമാകുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു."</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 386e740..ee442aa 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Салгах уу?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Энэ таныг дараах холболтоос салгах болно:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Танд Блютүүт тохиргоог өөрчлөх зөвшөөрөл байхгүй байна."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> нь Блютүүт Тохиргоо нээлттэй үед ойролцоох төхөөрөмжүүдэд харагдана."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г салгах уу?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Цацалт"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Профайлыг идэвхгүйжүүлэх үү?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi-Fi, блютүүт , нислэгийн горим, үүрэн сүлжээнүүд, &amp; VPNs-г удирдах"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Үүрэн дата"</string>
     <string name="calls_title" msgid="3544471959217176768">"Дуудлага"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS Мессеж"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Үүрэн сүлжээгээр дата ашиглалтыг зөвшөөрөх"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Роуминг дээр дата ашиглалтыг зөвшөөрөх"</string>
     <string name="roaming" msgid="3596055926335478572">"Дата роуминг"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Администратор, шифрлэлтийн бодлого, эсхүл жуухын сангаас идэвхгүйжүүлсэн"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Байхгүй"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Шудрах"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"Тайлах нууц үгийг арилгах"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"Тайлах нууц үгийг өөрчлөх"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Хөгжим болон медианд зориулсан"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Тохиргоог сануулах"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi Туслагч"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi-Fi туслагчаар дамжуулан холбогдлоо"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Дамжуулах дэлгэц"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Утасгүй дэлгэцийг идэвхжүүлэх"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Ойролцоо төхөөрөмж олдсонгүй."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi тохиргоо"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Утасгүй хандалтын цэгүүдийг тохируулах &amp; удирдах"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi-Fi сүлжээ сонгоно уу"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi сонгох"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi-г асааж байна…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi-г унтрааж байна…"</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"АНХААРУУЛГА: Хэрэв та Wi‑Fi-г алгасвал таны таблет эхний татан авалтууд болон шинэчлэлтүүд хийхэд шаардлагатай интернэт холболт байхгүй болно. Дата төлбөр гарч болзошгүй тул Wi-Fi-д холбогдоно уу."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"АНХААРУУЛГА: Хэрэв та Wi‑Fi-г алгасвал таны төхөөрөмж эхний татан авалтууд болон шинэчлэлтүүд хийхэд шаардлагатай интернэт холболт байхгүй болно. Дата төлбөр гарч болзошгүй тул Wi-Fi-д холбогдоно уу."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"АНХААРУУЛГА: Хэрэв та Wi‑Fi-г алгасвал таны утас эхний татан авалтууд болон шинэчлэлтүүд хийхэд шаардлагатай интернэт холболт байхгүй болно. Дата төлбөр гарч болзошгүй тул Wi-Fi-д холбогдоно уу."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Хэрэв та Wi-Fi: \n\n-ыг алгасвал таны таблет интернетэд холбогдохгүй. \n\n  Та интернетэд холбогдохгүйгээр програм хангамжаа шинэчилж чадахгүй. \n\n Та одоогоор төхөөрөмжийнхөө хамгаалалтын функцүүдийг идэвхжүүлэх боломжгүй."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Хэрэв та Wi-Fi:\n\n-ыг алгасвал таны төхөөрөмж интернетэд холбогдохгүй.  \n\n Та интернетэд холбогдохгүйгээр програм хангамжаа шинэчилж чадахгүй. \n\n Та одоогоор төхөөрөмжийнхөө хамгаалалтын функцүүдийг идэвхжүүлэх боломжгүй."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Хэрэв та Wi-Fi:\n\n-ыг алгасвал таны гар утас интернетэд холбогдохгүй.  \n\n Та интернетэд холбогдохгүйгээр програм хангамжаа шинэчилж чадахгүй. \n\n Та одоогоор төхөөрөмжийнхөө хамгаалалтын функцүүдийг идэвхжүүлэх боломжгүй."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Таблет энэ Wi-Fi сүлжээнд холбогдож чадсангүй."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Энэ төхөөрөмж Wi-Fi сүлжээнд холбогдож чадсангүй."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Энэ утас Wi-Fi сүлжээнд холбогдож чадсангүй."</string>
@@ -1087,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM карт оруулаад дахин эхлүүлнэ үү"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Интернэтэд холбогдоно уу"</string>
     <string name="location_title" msgid="1029961368397484576">"Миний Байршил"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Ажлын профайл"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ажлын профайлын байршил"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Танай компаниас унтраасан байна"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Горим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Өндөр нарийвчлалтай"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Батерей хэмнэх"</string>
@@ -1440,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Цэнэглэж байх үед дэлгэц хэзээ ч амрахгүй"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Блютүүт HCI снүүп логыг идэвхжүүлэх"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Файл доторх бүх блютүүт HCI пакетуудыг унших"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM түгжээ тайлагч"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Bootloader-н түгжээг тайлахыг зөвшөөрөх"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Пин кодоо оруул"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM түгжээ тайлагчийг идэвхжүүлэхийн тулд төхөөрөмжийнхөө пин кодыг оруулна уу."</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM түгжээ тайлагчийг зөвшөөрөх үү?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"АНХААР: Энэ тохиргоо асаалттай байгаа үед тухайн төхөөрөмжийн хамгаалалтын функцүүд ажиллахгүй."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Утасгүй дэлгэцийн сертификат"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi Verbose лог-г идэвхжүүлэх"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Үүрэн шилжүүлэг рүү идэвхтэй Wi‑Fi"</string>
@@ -1856,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Апп датаг оруулах"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автоматаар сэргээх"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Апп дахин суулгах үед нөөцөлсөн тохиргоонууд болон өгөгдлийг сэргээгээрэй"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Нөөцлөлт үйлчилгээ идэвхгүй байна."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Үүнийг таны төхөөрөмжийн бодлогын дагуу суулгасан байна."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Десктоп нөөшлөлтийн нууц үг"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Десктоп бүрэн нөөцлөлт одоогоор хамгаалалтгүй байна"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Десктоп дээрх бүрэн нөөшлөлтийн нууц үгийг өөрчлөх буюу арилгахын тулд хүрнэ үү"</string>
@@ -2011,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Дэлгэц нийлүүлэхэд GPU-г байнга ашиглах"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Өнгөний орчныг дууриах"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL тэмдэглэлийг идэвхжүүлэх"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer-г ашиглах (хялбаршуулсан)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Ихэнх медиаг тоглуулахдаа NuPlayer-н оронд AwesomePlayer-г ашиглах"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB аудио роутинг идэвхгүйжүүлэх"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB аудио периферал руу автоматаар роутинг хийхийг идэвхгүйжүүлэх"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Байршлын хүрээг харуулах"</string>
@@ -2325,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM-ийнхээ нэрийг оруулна уу"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM слот %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор компани"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Дугаар"</string>
@@ -2336,7 +2327,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"Бусад дуудлагын тохиргоо"</string>
@@ -2502,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Хөндлөн харагдацаар хадгалах"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Одоогийн байрлалаар хадгалах"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI мэдээлэл"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI хамаарах мэдээлэл"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифрлэлт"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Үргэлжлүүлэх"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Та энэ төхөөрөмжийг эхлүүлэхийн өмнө PIN шаардагддаг болгон хамгаалалтыг сайжруулах боломжтой. Төхөөрөмж асахаас өмнө дуудлага, зурвас, мэдэгдэл, сэрүүлэг хүлээн авах боломжгүй. \n\nЭнэ нь гээсэн буюу хулгайд алдсан төхөөрөмжийн датаг хамгаалахад шаардлагатай."</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 3b348cd..51ae544 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"‍डिस्कनेक्ट करायचे?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"हे यासह आपले कनेक्शन समाप्त करेल:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"आपल्‍याकडे ब सेटिंग्‍ज बदलण्‍याची परवानगी नाही."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ब सेटिंग्ज उघड्या असताना जवळपासच्या डिव्हाइसेसवर <xliff:g id="DEVICE_NAME">%1$s</xliff:g> दृश्यमान असते."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> डिस्कनेक्ट करायचे?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"प्रोफाईल अक्षम करायचे?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"वाय-फाय, ब, विमान मोड, सेल्युलर नेटवर्क आणि VPN व्यवस्थापित करा"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"सेल्युलर डेटा"</string>
     <string name="calls_title" msgid="3544471959217176768">"कॉल"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS संदेश"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"सेल्युलर नेटवर्कवर डेटा वापरास अनुमती द्या"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"रोमिंग करताना डेटा वापरास अनुमती द्या"</string>
     <string name="roaming" msgid="3596055926335478572">"डेटा रोमिंग"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"प्रशासकाद्वारे, कूटबद्धीकरण धोरण किंवा क्रडेन्शियल संचयनाद्वारे अक्षम केले"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"काहीही नाही"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"स्‍वाइप करा"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"नमुना अनलॉक करा काढा"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"अनलॉक पिन काढा"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"अनलॉक संकेतशब्द काढा"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलॉक नमुना बदला"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदला"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"संकेतशब्द अनलॉक करा बदला"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत आणि मीडियासाठी"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग्ज लक्षात ठेवा"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"वाय-फाय सहाय्यक"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi सहाय्यक द्वारे कनेक्ट केले"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"स्क्रीन कास्‍ट करा"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस प्रदर्शन सक्षम करा"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"कोणतीही जवळपासचे डिव्हाइसेस आढळली नाहीत."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"वाय-फाय सेटिंग्ज"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"वाय-फाय"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"वायरलेस प्रवेश बिंदू सेट करा आणि  व्यवस्थापित करा"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"वाय-फाय नेटवर्क निवडा"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"वाय-फाय निवडा"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"वाय-फाय चालू करीत आहे..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"वाय-फाय बंद करीत आहे…"</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"चेतावणी: आपण वाय-फाय वगळल्‍यास, आपला टॅब्‍लेट केवळ सुरुवातीच्या डाउनलोडसाठी किंवा अद्यतनांसाठी सेल्‍युलर डेटाचा वापर करेल. संभाव्य असलेले डेटा शुल्क टाळण्‍यासाठी वाय-फाय शी कनेक्‍ट करा."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"चेतावणी: आपण वाय-फाय वगळल्‍यास, आपले डिव्‍हाइस केवळ सुरुवातीच्या डाउनलोडसाठी किंवा अद्यतनांसाठी सेल्‍युलर डेटाचा वापर करेल. संभाव्य असलेले डेटा शुल्क टाळण्‍यासाठी, वाय-फाय शी कनेक्‍ट करा."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"चेतावणी: आपण वाय-फाय वगळल्‍यास, आपला फोन केवळ सुरुवातीच्या डाउनलोडसाठी किंवा अद्यतनांसाठी सेल्‍युलर डेटाचा वापर करेल. संभाव्य असलेले डेटा शुल्क टाळण्‍यासाठी वाय-फाय शी कनेक्‍ट करा."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"आपण वाय-फाय वगळल्यास:\n\nआपल्या टॅब्लेटवर इंटरनेट कनेक्शन नसेल.\n\nआपण इंटरनेटशी कनेक्ट करेपर्यंत आपल्याला सॉफ्टवेअर अद्यतने मिळणार नाहीत.\n\nआपण आत्ता डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करू शकत नाही."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"आपण वाय-फाय वगळल्यास:\n\nआपल्या डिव्हाइसवर इंटरनेट कनेक्शन नसेल.\n\nआपण इंटरनेटशी कनेक्ट करेपर्यंत आपल्याला सॉफ्टवेअर अद्यतने मिळणार नाहीत.\n\nआपण आत्ता डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करू शकत नाही."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"आपण वाय-फाय वगळल्यास:\n\nआपल्या फोनवर इंटरनेट कनेक्शन नसेल.\n\nआपण इंटरनेटशी कनेक्ट करेपर्यंत आपल्याला सॉफ्टवेअर अद्यतने मिळणार नाहीत.\n\nआपण आत्ता डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करू शकत नाही."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"टॅब्लेट या वाय-फाय नेटवर्कशी कनेक्ट करण्यात अक्षम होता."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"डिव्हाइस या वाय-फाय नेटवर्कशी कनेक्ट करण्यात अक्षम होते."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"फोन या वाय-फाय नेटवर्कशी कनेक्ट करण्यात अक्षम होता."</string>
@@ -1087,12 +1090,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"कार्य प्रोफाईल"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"कार्य प्रोफाईलसाठी स्थान"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"आपल्या कंपनीने बंद केले आहे"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"मोड"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च अचूकता"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"बॅटरी बचत"</string>
@@ -1440,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"चार्ज होत असताना स्क्रीन कधीही निष्क्रिय होणार नाही"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ब HCI स्नूप लॉग सक्षम करा"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"सर्व ब HCI पॅकेट एका फाईलमध्ये कॅप्चर करा"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM अनलॉक करणे"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"बूटलोडर अनलॉक करण्यासाठी अनुमती द्या"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"आपला PIN प्रविष्ट करा"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM अनलॉक सक्षम करण्यासाठी आपले डिव्हाइस PIN प्रविष्ट करा"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM अनलॉक करण्यास अनुमती द्यायची?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"चेतावणी: ही सेटिंग चालू असताना या डिव्हाइसवर डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"वायरलेस प्रदर्शन प्रमाणीकरण"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"वाय-फाय शब्दपाल्हाळ लॉगिंग सक्षम करा"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"सेल्‍युलर सोपविण्‍यावरील आक्रमक वाय-फाय"</string>
@@ -1856,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"अॅप डेटा समाविष्ट करा"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"स्वयंचलित पुनर्संचयन"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"अॅप पुनर्स्थापित करताना, बॅक अप घेतलेल्या सेटिंग्ज आणि डेटा पुनर्संचयित करा"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"बॅकअप सेवा निष्क्रिय आहे."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"हे आपल्या डिव्हाइस धोरणानुसार सेट केले आहे."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्कटॉप बॅकअप संकेतशब्द"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्कटॉप पूर्ण बॅक अप सध्या संरक्षित नाहीत"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"डेस्कटॉपच्या पूर्ण बॅकअपसाठी असलेला संकेतशब्द बदलण्यासाठी किंवा काढून टाकण्यासाठी स्पर्श करा"</string>
@@ -2011,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"स्क्रीन तयार करण्यासाठी नेहमी GPU वापरा"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"रंग स्थानाची बतावणी करा"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL ट्रेस सक्षम करा"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer वापरा (नापसंत केलेले)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"बर्‍याच मीडिया प्लेबॅकसाठी NuPlayer ऐवजी AwesomePlayer वापरा"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ऑडिओ राउटिंग अक्षम करा"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ऑडिओ परिधीय वरील स्वयंचलित राउटिंग अक्षम करा"</string>
     <string name="debug_layout" msgid="5981361776594526155">"लेआउट सीमा दर्शवा"</string>
@@ -2325,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"सिम नाव प्रविष्ट करा"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"सिम स्लॉट %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"वाहक"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"संख्या"</string>
@@ -2336,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"जांभळा"</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>
@@ -2502,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"भूदृश्य दृश्‍यामध्ये रहा"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिमुखतेमध्ये रहा"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI माहिती"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI सापेक्ष माहिती"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"कूटबद्धीकरण"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"सुरु ठेवा"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"आपण या डिव्हाइसचा प्रारंभ करण्यापूर्वी आपला PIN आवश्यक करून हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइसचा प्रारंभ होईपर्यंत, ते अलार्मसह, कॉल, संदेश किंवा सूचना प्राप्त करू शकत नाही.\n\nयामुळे गहाळ किंवा चोरी झालेल्या डिव्हाइसेसवरील डेटा संरक्षित करण्यात मदत होते."</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 8677fa7..4b8b717 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Putuskan sambungan?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tindakan ini akan menamatkan sambungan anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Anda tidak mempunyai kebenaran untuk menukar tetapan Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> blh dlihat olh prnti lain smasa Ttpan BT dibuka."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Putuskan sambungan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Penyiaran"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Lumpuhkan profil?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Urus Wi‑Fi, Bluetooth, mod pesawat, rangkaian selular &amp; VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Data selular"</string>
     <string name="calls_title" msgid="3544471959217176768">"Panggilan"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mesej SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Bnrkn pgunaan data mlalui rgkian selular"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Bnrkn pgunaan data ms pryauan"</string>
     <string name="roaming" msgid="3596055926335478572">"Perayauan data"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keselamatan sederhana ke tinggi"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Kata laluan"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Keselamatan tinggi"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dlumpuhkn pentadbir, dsr penyulitan/storan klayakn"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Tiada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Leret"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Alih keluar corak buka kunci"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Alih keluar PIN buka kunci"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Alih keluar kata laluan buka kunci"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Tukar corak buka kunci"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Tukar PIN buka kunci"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Tkr kta lluan bka knci"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk muzik dan media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat tetapan"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Pembantu Wi-Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Disambungkan melalui Pembantu Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Skrin Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Dayakan paparan wayarles"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tiada peranti berdekatan ditemui."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Tetapan Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Sediakan &amp; urus titik capaian wayarles"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Pilih rangkaian Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Pilih Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Menghidupkan Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Mematikan Wi‑Fi…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Imbasan sentiasa tersedia"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Sentiasa benarkan pengimbasan"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Benarkan perkhidmatan lokasi Google dan apl lain mengimbas rangkaian, walaupun semasa Wi-Fi dimatikan"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Gunakan Wi-Fi terbuka secara automatik"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Biarkan pembantu Wi-Fi menyambung scr automatik ke rangkaian tbuka yg ditentukan sbg bkualiti tinggi"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Pilih pembantu"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Pasang sijil"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Untuk memperbaik ketepatan lokasi dan untuk tujuan lain, Google dan apl lain mungkin mengimbas rangkaian berhampiran walaupun semasa Wi-Fi dimatikan. Jika anda tidak mahu ini berlaku, pergi ke Terperinci &gt; Pengimbasan sentiasa tersedia."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apl mungkin mengimbas rangkaian berhampiran, walaupun semasa Wi-Fi dimatikan. Jika anda tidak mahu ini berlaku, pergi ke Terperinci &gt; Pengimbasan sentiasa tersedia."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AMARAN: jika anda melangkau Wi-Fi, tablet anda hanya akan menggunakan data selular untuk muat turun awal dan kemas kini. Untuk mengelakkan kemungkinan caj data, sambung ke Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AMARAN: jika anda melangkau Wi-Fi, peranti anda hanya akan menggunakan data selular untuk muat turun awal dan kemas kini. Untuk mengelakkan kemungkinan caj data, sambung ke Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AMARAN: jika anda melangkau Wi-Fi, telefon anda hanya akan menggunakan data selular untuk muat turun awal dan kemas kini. Untuk mengelakkan kemungkinan caj data, sambung ke Wi-Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Jika anda melangkau Wi-Fi:\n\nTablet anda tidak akan mempunyai sambungan Internet.\n\nAnda tidak akan mendapat kemas kini perisian sehingga anda bersambung ke Internet.\n\nAnda tidak boleh mengaktifkan ciri perlindungan peranti pada masa ini."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Jika anda melangkau Wi-Fi:\n\nPeranti anda tidak akan mempunyai sambungan Internet.\n\nAnda tidak akan mendapat kemas kini perisian sehingga anda bersambung ke Internet.\n\nAnda tidak boleh mengaktifkan ciri perlindungan peranti pada masa ini."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Jika anda melangkau Wi-Fi:\n\nTelefon anda tidak akan mempunyai sambungan Internet.\n\nAnda tidak akan mendapat kemas kini perisian sehingga anda bersambung ke Internet.\n\nAnda tidak boleh mengaktifkan ciri perlindungan peranti pada masa ini."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet tidak dapat menyambung ke rangkaian Wi-Fi ini."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Peranti tidak dapat menyambung ke rangkaian Wi-Fi ini."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon tidak dapat menyambung ke rangkaian Wi-Fi ini."</string>
@@ -836,7 +836,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angkat untuk bangunkan"</string>
     <string name="doze_title" msgid="2259176504273878294">"Paparan ambien"</string>
-    <string name="doze_summary" msgid="7128970177894383698">"Bangunkan skrin apabila anda mengambil peranti atau menerima pemberitahuan"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"Aktifkan skrin apabila anda mengambil peranti atau menerima pemberitahuan"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Saiz fon"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Tetapan kunci kad SIM"</string>
@@ -1016,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" tablet anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" telefon anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Terdapat pengguna lain pada peranti ini.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna yang lain"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Untuk memadam bersih muzik, gambar dan data pengguna lain, "<b>"storan USB"</b>" perlu dipadamkan."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"kad SD"</b>" perlu dipadamkan."</string>
@@ -1091,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sila masukkan kad SIM dan mulakan semula"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Sila sambung ke internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Lokasi Saya"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profil kerja"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokasi untuk profil kerja"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Dimatikan oleh syarikat anda"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Kejituan tinggi"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Penjimatan bateri"</string>
@@ -1856,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Masukkan data apl"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan automatik"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Apabila memasang semula aplikasi, pulihkan tetapan dan data yang disandarkan"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Perkhidmatan sandaran tidak aktif."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ini ditetapkan oleh dasar peranti anda."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Kata laluan sandaran komputer meja"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Sandaran penuh meja komputer tidak dilindungi pada masa ini"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Sentuh untuk menukar atau mengalih keluar kata laluan untuk sandaran penuh komputer meja"</string>
@@ -2012,7 +2006,7 @@
     <string name="simulate_color_space" msgid="6745847141353345872">"Tiru ruang warna"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Dayakan kesan OpenGL"</string>
     <string name="use_awesomeplayer" msgid="1583337008516364226">"Gunakan AwesomePlayer (ditamatkan)"</string>
-    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Gunakan AwesomePlayer dan bukannya NuPlayer untuk kebanyakan main balik media"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Gunakan AwesomePlayer, bukan NuPlayer, untuk main balik media"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Lmpuhkn phalaan audio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Lumpuhkn pghalaan automatik ke persisian audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Tunjukkan batas reka letak"</string>
@@ -2323,8 +2317,7 @@
     <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 kosong"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nama SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Masukkan nama SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Pembawa"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nombor"</string>
@@ -2334,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Ungu"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Tiada kad SIM dimasukkan"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Maklumat berkaitan SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Panggil balik dari SIM lalai"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM untuk panggilan keluar"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Tetapan panggilan lain"</string>
@@ -2500,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Maklumat IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Maklumat relatif IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Penyulitan"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Teruskan"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Anda boleh melindungi peranti ini selanjutnya dengan meminta PIN anda sebelum peranti dimulakan. Sehingga peranti dimulakan, peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera. \n\nIni membantu melindungi data pada peranti yang hilang atau dicuri."</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 16b1f27..4536d94 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ချိတ်ဆက်ခြင်းရပ်တန့်မလား?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">":&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;နှင့်ချိတ်ဆက်မှုများကို ပြီးဆုံးစေပါမည်"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"ဘလူးတုသ် ဆက်တင်များကို ပြောင်းလဲရန် သင့်ဆီမှာ ခွင့်ပြုချက် မရှိပါ။"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ဘလူးတုသ် ဖွင့်ထားလျှင် <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ကို အနီးရှိ ကိရိယာများ မြင်နိုင်သည်။"</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ကို အဆက်ဖြတ်ရမလား?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ထုတ်လွှင့်ခြင်း"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ကိုယ်ရေးအချက်အလက်အား ဖျောက်မည်လား"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"ဝိုင်ဖိုင်၊ ဘလူးတုသ်၊ လေယာဉ်ပျံ မုဒ်၊ ဆယ်လူလာ ကွန်ရက်များ &amp;VPN များကို စီမံခန့်ခွဲရန်"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"ဆယ်လူလာ ဒေတာ"</string>
     <string name="calls_title" msgid="3544471959217176768">"ခေါ်ဆိုမှုများ"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS စာတိုများ"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"ဆယ်လူလာ ကွန်ရက် တစ်လျှောက် ဒေတာ သုံးစွဲမှု ခွင့်ပြုရန်"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"ရိုမင်း လုပ်ချိန်မှာ ဒေတာ သုံးစွဲမှု ခွင့်ပြုရန်"</string>
     <string name="roaming" msgid="3596055926335478572">"ကွန်ယက်ပြင်ပဒေတာအသုံးပြုခြင်း"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"အက်မင်၊ ပေါ်လစီ သို့ ယုံကြည်သောအကောင့်မှ ပိတ်ထားသည်"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"တစ်ခုမှမဟုတ်ပါ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ပွတ်ဆွဲရန်"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ဖွင့်ရန်ပုံဖော်မှုအား ဖယ်ရှားမည်"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"သော့ဖွင့်ရန်ပင်နံပါတ်အား ဖယ်ရှားမည်"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"သော့ဖွင့်ရန်စကားဝှက်အား ဖယ်ရှားမည်"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"သော့ဖွင့်ရန်ပုံဖော်မှုအား ပြောင်းမည်"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ပင်နံပါတ်ပြောင်းမည်"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ဖွင့်ရန်စကားဝှက်အား ပြောင်းမည်"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"သီချင်းနှင့်မီဒီယာအတွက်"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ဆက်တင်များအားမှတ်မိစေရန်"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"ကြိုးမဲ့ ကူညီပေးသူ"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"ကြိုးမဲ့ကူညီသူမှတဆင့် ချိတ်ဆက်၏"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"အရိပ်ထင်မျက်နှာပြင်"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ကြိုးမဲ့ ပြသမှုကို ဖွင့်ရန်"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"အနီးနားတွင် စက်ပစ္စည်း ရှာမတွေ့ပါ။"</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"ဝိုင်ဖိုင်ဆက်တင်များ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"ဝိုင်ဖိုင်"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ကြိုးမဲ့ချိတ်ဆက်ပွိုင့်များအား သတ်မှတ်ခြင်း &amp;  စီမံခြင်း"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"ဝိုင်ဖိုင်ကွန်ယက် ရွေးချယ်ရန်"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"ကြိုးမဲ့ကို ရွေးချယ်ရန်"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"ဝိုင်ဖိုင်ဖွင့်နေသည် …"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"ဝိုင်ဖိုင်ပိတ်နေသည် …"</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"သတိပေးချက်: သင်က ကြိုးမဲ့ကို ကျော်သွားလျင်၊ သင်၏ တက်ဘလက်မှာ ကနဦး ဒေါင်းလုဒ်များ နှင့်  မွမ်းမံမှုများ အတွက် ဆယ်လူလာ ဒေတာကို သုံးမည် မဟုတ်ပါ။ ဒေတာ အတွက် ငွေတောင်းခံ လာနိုင်တာကို ရှောင်ရှားရန်၊ ကြိုးမဲ့သို့  ချိတ်ဆက်ပါ။"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"သတိပေးချက်: သင်က ကြိုးမဲ့ကို ကျော်သွားလျင်၊ သင်၏ ကိရိယာမှာ ကနဦး ဒေါင်းလုဒ်များ နှင့်  မွမ်းမံမှုများ အတွက် ဆယ်လူလာ ဒေတာကို သုံးမည် မဟုတ်ပါ။ ဒေတာ အတွက် ငွေတောင်းခံ လာနိုင်တာကို ရှောင်ရှားရန်၊ ကြိုးမဲ့သို့ ချိတ်ဆက်ပါ။"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"သတိပေးချက်: သင်က ကြိုးမဲ့ကို ကျော်သွားလျင်၊ သင်၏ ဖုန်းမှာ ကနဦး ဒေါင်းလုဒ်များ နှင့်  မွမ်းမံမှုများ အတွက် ဆယ်လူလာ ဒေတာကို သုံးမည် မဟုတ်ပါ။ ဒေတာ အတွက် ငွေတောင်းခံ လာနိုင်တာကို ရှောင်ရှားရန်၊ ကြိုးမဲ့သို့  ချိတ်ဆက်ပါ။"</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"ဝိုင်ဖိုင်အား ကျော်သွားလျှင်:\n\nသင့်တက်ဘလက်တွင် အင်တာနက်ချိတ်ဆက်မှုရှိမည် မဟုတ်ပါ။\n\nသင် အင်တာနက်ဖြင့် ချိတ်ဆက်မှသာ ဆော့ဖ်ဝဲအဆင့်မြှင့်မှုများ ရရှိနိုင်မည်။\n\nယခုမူ စက်ကိရိယာကာကွယ်ရေးအင်္ဂါရပ်များအား ဖွင့်လှစ်ရရှိနိုင်မည်မဟုတ်ပါ။"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"ဝိုင်ဖိုင်အား ကျော်သွားလျှင်:\n\nသင့်ကိရိယာတွင် အင်တာနက်ချိတ်ဆက်မှုရှိမည် မဟုတ်ပါ။\n\nသင် အင်တာနက်ဖြင့် ချိတ်ဆက်မှသာ ဆော့ဖ်ဝဲအဆင့်မြှင့်မှုများ ရရှိနိုင်မည်။\n\nယခုမူ စက်ကိရိယာကာကွယ်ရေးအင်္ဂါရပ်များအား ဖွင့်လှစ်ရရှိနိုင်မည်မဟုတ်ပါ။"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"ဝိုင်ဖိုင်အား ကျော်သွားလျှင်:\n\nသင့်ဖုန်းတွင် အင်တာနက်ချိတ်ဆက်မှုရှိမည် မဟုတ်ပါ။\n\nသင် အင်တာနက်ဖြင့် ချိတ်ဆက်မှသာ ဆော့ဖ်ဝဲအဆင့်မြှင့်မှုများ ရရှိနိုင်မည်။\n\nယခုမူ စက်ကိရိယာကာကွယ်ရေးအင်္ဂါရပ်များအား ဖွင့်လှစ်ရရှိနိုင်မည်မဟုတ်ပါ။"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"တက်ဘလက်သည် ဤ ဝိုင်ဖိုင်ကွန်ရက်သို့ မချိတ်ဆက်နိုင်ပါ။"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"ကိရိယာသည် လက်ရှိ ကြိုးမဲ့ ကွန်ရက်ကို ချိတ်ဆက် မရခဲ့ပါ။"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ဖုန်းသည် ဤဝိုင်ဖိုင်ကွန်ရက်သို့ ချိတ်ဆက်၍ မရနိုင်ပါ"</string>
@@ -1088,12 +1091,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"အလုပ် ပရိုဖိုင်"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"အလုပ်ပရိုဖိုင်အတွက် တည်နေရာ"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"သင့်ကုမ္ပဏီမှပိတ်ထားခြင်းဖြစ်၏"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"စနစ်"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"တိကျမှုအမြင့်ဆုံး"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ဘက်ထရီအသုံးပြုမှု ချွေတာရန်"</string>
@@ -1853,10 +1853,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"app ဒေတာကို ထည့်သွင်းရန်"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"အလိုအလျောက် ပြန်လည်ရယူမည်"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"အပလီကေးရှင်းကို ပြန်လည်ထုတ်လျှင် အရန်ပြုလုပ်ထားသောဆက်တင်များနှင့် ဒေတာများကို ပြန်လည်ရယူရန်ပြုလုပ်မည်။"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"အရန်သိမ်းဆည်းခြင်း ဝန်ဆောင်မှု အလုပ်မလုပ်ပါ။"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"သင့်ကိရိယာ၏ မူဝါဒအရ ဖြစ်၏။"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop အရန်စကားဝှက်"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"အလုပ်ခုံတွင် အရန်သိမ်းဆည်းခြင်းများကို လောလောဆယ် မကာကွယ်နိုင်ပါ။"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"အလုပ်ခုံ တွင် အရန်သိမ်းဆည်းခြင်းအပြည့်လုပ်ရန် အတွက် စကားဝှက်ဖယ်ရန် သို့ ပြောင်းရန် တို့ထိပါ။"</string>
@@ -2320,8 +2318,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"ဆင်းမ်အမည် ရိုက်ထည့်ပါ"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"ဆင်းမ် အထိုင် %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"စီမံပေးသူ"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"နံပါတ်"</string>
@@ -2331,7 +2328,6 @@
     <string name="color_purple" msgid="3888532466427762504">"ခရမ်း"</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>
@@ -2497,7 +2493,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ဘေးတိုက် မြင်ကွင်း ထဲမှာ ရှိနေရန်"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"လက်ရှိ လှည့်ထားမှုအတိုင်း ရှိနေရန်"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI အချက်အလက်များ"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI ဆက်စပ် အချက်အလက်များ"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"လျှို့ဝှက်ကုဒ်သွင်းခြင်း"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ဆက်သွားရန်"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်ခြင်းမပြုမီ PIN အသုံးပြုခြင်းဖြင့် ထပ်လောင်း ကာကွယ်နိုင်သည်။ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်မည့်အချိန်အထိ၊ နှိုးစက်များ အပါအဝင် အသိပေးချက်များ၊ စာတိုများနှင့် ဖုန်းခေါ်ဆိုခြင်းများ လက်ခံရယူနိုင်ခြင်း မရှိပါ။\n\nဤနည်းဖြင့် ​ဒေတာ ပျောက်ဆုံးခြင်း သို့မဟုတ် စက်ပစ္စည်းအား ခိုးယူခံရခြင်းများမှ ကာကွယ်နိုင်သည်။"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a492b9c..c9f1609 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vil du koble fra?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dette vil avslutte tilkoblingen til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Du har ikke tillatelse til å endre Bluetooth-innstillingene."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er synlig mens Bluetooth-innstillinger er åpen."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er synlig mens Bluetooth-innstillinger er åpne."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vil du koble fra <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Kringkasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vil du deaktivere profilen?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Administrer Wi-Fi, Bluetooth, flymodus, mobilnettverk og VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobildata"</string>
     <string name="calls_title" msgid="3544471959217176768">"Anrop"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Tekstmeldinger"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Tekstmeldinger"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Tillat databruk over mobilnettet"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Tillat databruk ved roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Middels til høy sikkerhet"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Høy sikkerhet"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funksjoner for enhetsbeskyttelse kommer ikke til å fungere lenger."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Deaktivert av admin., krypteringsregel eller legitimasjonslager"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Sveip"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjern opplåsingsmønster"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjern PIN-koden for opplåsing"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Fjern opplåsingspassord"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Fjern skjermlåsen"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Endre opplåsingsmønster"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Endre PIN-koden for opplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Endre passord for opplåsning"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For musikk og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk innstillinger"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi-Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Koblet til via en Wi-Fi-assistent"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Cast skjermen"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktiver trådløs skjermdeling"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Finner ingen enheter i nærheten."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Innstillinger for Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Sett opp og styr trådløse aksesspunkt"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Velg Wi-Fi-nettverk"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Velg Wi-Fi-nettverk"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Slår på Wi-Fi …"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Slår av Wi-Fi …"</string>
@@ -600,7 +602,7 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Skanning er alltid tilgjengelig"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Alltid tillat skanning"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Tillat at Googles posisjonstjeneste og andre apper skanner etter nettverk, selv når Wi-Fi er slått av"</string>
-    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Bruk til å åpne Wi‑Fi automatisk"</string>
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Bruk åpen Wi‑Fi automatisk"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Tillat at en Wi‑Fi-assistent automatisk kobler til nettverk som ser ut til å være av høy kvalitet"</string>
     <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Velg assistent"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer sertifikater"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ADVARSEL: Hvis du hopper over Wi-Fi, bruker nettbrettet ditt bare mobildata for automatiske nedlastinger og oppdateringer. For å unngå mulige datakostnader bør du koble til Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ADVARSEL: Hvis du hopper over Wi-Fi, bruker enheten din bare mobildata for automatiske nedlastinger og oppdateringer. For å unngå mulige datakostnader bør du koble til Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ADVARSEL: Hvis du hopper over Wi-Fi, bruker telefonen din bare mobildata for automatiske nedlastinger og oppdateringer. For å unngå mulige datakostnader bør du koble til Wi-Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Hvis du hopper over Wi-Fi:\n\nNettbrettet får ikke Internett-tilkobling.\n\nDu får ikke programvareoppdateringer før du er tilkoblet Internett.\n\nDu kan ikke aktivere funksjonene for enhetsbeskyttelse nå."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Hvis du hopper over Wi-Fi:\n\nEnheten får ingen Internett-tilkobling.\n\nDu får ikke programvareoppdateringer før du er koblet til Internett.\n\nDu kan ikke aktivere funksjonene for enhetsbeskyttelse nå."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Hvis du hopper over Wi-Fi:\n\nTelefonen får ikke Internett-tilkobling.\n\nDu får ikke programvareoppdateringer før du er koblet til Internett.\n\nDu kan ikke aktivere funksjonene for enhetsbeskyttelse nå."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Nettbrettet kunne ikke koble til Wi-Fi-nettverket."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Enheten kunne ikke koble til dette Wi-Fi-nettverket."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonen kunne ikke koble til Wi-Fi-nettverket."</string>
@@ -878,7 +877,7 @@
     <string name="fcc_equipment_id" msgid="149114368246356737">"Utstyrs-ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Basisbåndversjon"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kjerneversjon"</string>
-    <string name="build_number" msgid="3075795840572241758">"Byggnummer"</string>
+    <string name="build_number" msgid="3075795840572241758">"Delversjonsnummer"</string>
     <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ikke tilgjengelig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sett inn SIM-kortet og start enheten på nytt"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Koble deg til Internett"</string>
     <string name="location_title" msgid="1029961368397484576">"Min posisjon"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Jobbprofil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Sted for arbeidsprofil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Deaktivert av bedriften."</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Stor nøyaktighet"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparing"</string>
@@ -1200,7 +1196,7 @@
     <string name="screen_compatibility_label" msgid="663250687205465394">"Skjermkompatibilitet"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Rettigheter"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Hurtiglager"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Fjern hurtiglager"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Tøm bufferen"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Hurtiglager"</string>
     <string name="controls_label" msgid="7611113077086853799">"Kontroller"</string>
     <string name="force_stop" msgid="7435006169872876756">"Tving avslutning"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inkluder appdata"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Auto-gjenoppretting"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Gjenopprett sikkerhetskopierte innstillinger og data når apper installeres"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Sikkerhetskopieringstjenesten er inaktiv."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Dette er angitt i retningslinjene for enheten."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Passord for sikkerhetskopiering på datamaskin"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Fullstendig sikkerhetskopiering på datamaskin beskyttes ikke for øyeblikket."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Trykk for å endre eller fjerne passordet for fullstendige sikkerhetskopier på datamaskinen"</string>
@@ -2319,8 +2313,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-kort <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Tomt SIM-kort"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Navn på SIM-kort"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Skriv inn SIM-navn"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-kortspor %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operatør"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nummer"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lilla"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Det er ikke satt inn noe SIM-kort"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM-status"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM-relatert informasjon"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Ring tilbake fra standard SIM-kort"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-kort for utgående anrop"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Andre anropsinnstillinger"</string>
@@ -2473,9 +2465,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Kvelder på ukedager"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttidspunkt"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttidspunkt"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> dagen etter"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> neste dag"</string>
     <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> eller en alarm før"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> dagen etter eller en alarm før"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> neste dag eller en alarm før"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appvarsler"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Varselinnstillinger"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send tilbakemelding om enheten"</string>
@@ -2496,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-informasjon"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI-relatert informasjon"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Kryptering"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsett"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Du kan beskytte denne enheten ved å kreve en PIN-kode ved oppstart. Frem til enheten starter kan den ikke motta oppringninger, meldinger eller varsler, inkludert alarmer. \n\nDette beskytter informasjonen på enheter som er mistet eller stjålet."</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index a3322bf..7543652 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"विच्छेदन गर्ने हो?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"&lt;br&gt; &lt;b&gt;: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>का साथ जडान समाप्त गर्दछ &lt;/ b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"तपाईँ सँग ब्लुटुथ सेटिङ्हरू परिवर्तन गर्न अनुमति छैन।"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"ब्लुटुथ सेटिङ् खुलामा <xliff:g id="DEVICE_NAME">%1$s</xliff:g> नजिकका उपकरणहरूमा देखिन्छ।"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ब्लुटुथ सेटिङहरू खुला हुँदा <xliff:g id="DEVICE_NAME">%1$s</xliff:g> लाई नजिकैका उपकरणहरू देख्न सक्नेछन्।"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>विच्छेद गर्नुहुन्छ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"प्रोफाइल असक्षम पार्ने हो?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"वाइफाइ, ब्लुटुथ, हवाइजहाज मोड, सेलुलर सञ्जाल, र VPNs प्रबन्ध गर्नुहोस्"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"सेलुलर डेटा"</string>
     <string name="calls_title" msgid="3544471959217176768">"कलहरू"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS सन्देशहरू"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS सन्देशहरू"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"सेलुलर सञ्जालमा डेटा उपयोग गर्न अनुमति दिनुहोस्"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"रोमिङ हुँदा डेटा उपयोग अनुमति"</string>
     <string name="roaming" msgid="3596055926335478572">"डेटा रोमिङ"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"मध्यमदेखि उच्च सुरक्षा"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"पासवर्ड:"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"उच्च सुरक्षा"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"उपकरण सुरक्षा सुविधाहरूले अब उपरान्त काम गर्नेछैन।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"प्रशासक, इन्क्रिप्सन नीति वा प्रामाणिक डेटा भण्डारणले असक्षम पारेको"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"कुनै पनि होइन"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"स्वाइप गर्नुहोस्"</string>
@@ -410,6 +411,7 @@
     <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_password_summary" msgid="192161194564577025">"अनलक पासवर्ड हटाउनुहोस्"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"स्क्रीन लक हटाउनुहोस्"</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_password_title" msgid="5606298470358768865">"अनलक पासवर्ड परिवर्तन गर्नुहोस्"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत र मिडियाका लागि"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिङहरू सम्झनुहोस्"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"वाइफाइ सहायक"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi-Fi सहायक द्वारा जोडिएको"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"स्क्रिन कास्ट गर्नुहोस्"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस प्रदर्शन सक्षम गर्नुहोस्"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"नजिकै कुनै उपकरण भेटिएन।"</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"वाइफाइ सेटिङहरू"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"वाइफाइ"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ताररहित पहुँच बिन्दुहरू सेटअप र प्रबन्ध गर्नुहोस्"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi-Fi सञ्जाल चयन गर्नुहोस्"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"वाइफाइ चयन गर्नुहोस्"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"वाइफाइ खुला गर्दै..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"वाइफाइ निष्क्रिय पार्दै..."</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"चेतावनी: यदि तपाईँले वाइफाइ छोड्नु हुन्छ भने, तपाईँको ट्याब्लेटले प्रारम्भिक डाउनलोड र अद्यावधिकहरूको लागि सेलुलर डेटा मात्र प्रयोग गर्नेछ। सम्भावित डेटा शुल्क हटाउन, वाइफाइ जडान गर्नुहोस्।"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"चेतावनी: यदि तपाईँले वाइफाइ छोड्नु हुन्छ भने, तपाईँको उपकरणले प्रारम्भिक डाउनलोड र अद्यावधिकहरूको लागि सेलुलर डेटा मात्र प्रयोग गर्नेछ। सम्भावित डेटा शुल्क हटाउन, वाइफाइ जडान गर्नुहोस्।"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"चेतावनी: यदि तपाईँले वाइफाइ छोड्नु हुन्छ भने, तपाईँको फोनले प्रारम्भिक डाउनलोड र अद्यावधिकहरूको लागि सेलुलर डेटा मात्र प्रयोग गर्नेछ। सम्भावित डेटा शुल्क हटाउन, वाइफाइ जडान गर्नुहोस्।"</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"यदि तपाईं Wi-Fi छोड्नुहुन्छ भने\n\n तपाईंको ट्याब्लेटमा इन्टरनेट जडान हुँदैन। \n\n तपाईंले इन्टरनेट जडान नगर्नु भएसम्म तपाईंले सफ्टवेयर अद्यावधिक प्राप्त गर्नु हुने छैन। \n\n तपाईंले यस समयमा यन्त्र सुरक्षा सुविधाहरु सक्रिय गर्न सक्नुहुन्न।"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"यदि तपाईं Wi-Fi छाड्नुहुन्छ भने\n\n तपाईंको यन्त्र इन्टरनेटमा जडान हुने छैन। \n\n तपाईंले इन्टरनेट जडान नगर्नु भएसम्म तपाईंले सफ्टवेयर अद्यावधिक  प्राप्त गर्नु हुँदैन। \n\n तपाईंले यस समयमा यन्त्र सुरक्षा सुविधाहरु सक्रिय गर्न सक्नुहुन्न।"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"यदि तपाईं Wi-Fi छोड्नुहुन्छ भने \n\n तपाईंको फोनमा इन्टरनेट जडान हुँदैन। \n\n तपाईं इन्टरनेटमा जडान नहुनु भएसम्म तपाईंले सफ्टवेयर अद्यावधिक प्राप्त गर्नु हुने छैन। \n\n तपाईंले यस समयमा यन्त्र सुरक्षा सुविधाहरु सक्रिय गर्न सक्नु हुँदैन।"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ट्याब्लेट यस वाइफाइ नेटवर्कसँग जडान गर्न असमर्थ भयो।"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"यस वाइफाइ सञ्जालमा जडान गर्न उपकरण असमर्थ थियो।"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"यस वाइफाइ नेटवर्कमा जडान गर्न फोन असमर्थ थियो।"</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"कृपया SIM कार्ड भित्र राखेर पुनः स्टार्ट गर्नुहोस्"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"कृपया इन्टरनेटसँग जोड्नुहोस्"</string>
     <string name="location_title" msgid="1029961368397484576">"मेरो स्थान"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"कार्य प्रोफाइल"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"काम प्रोफाइलका लागि स्थान"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"तपाईँको कम्पनीद्वारा निस्क्रिय पारिएको छ"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"मोड"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च शुद्धता"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ब्याट्री बचत"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"अनुप्रयोग डेटा समावेश"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"स्वतः पुनःप्राप्त"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"जब अनुप्रयोग पुनर्स्थापित गर्दा ब्याक अप गरिएका सेटिङहरू र डेटा पुनःप्राप्त गर्नुहोस्"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"जगेडा सेवा निष्क्रिय छ।"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"यो तपाईँको यन्त्र नीतिले स्थापना गर्छ।"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्कटप ब्याकअप पासवर्ड"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्कटप पूर्ण जगेडाहरू हाललाई सुरक्षित छैनन्"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"डेस्कटप पूर्ण ब्याकअपको लागि पासवर्ड बदल्न वा हटाउन छुनुहोस्"</string>
@@ -2319,8 +2313,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM नाम प्रविष्ट गर्नुहोस्"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM स्लट %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"वाहक"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"संख्या"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"बैजनी"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"कुनै SIM कार्ड राखिएको छैन"</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">"पूर्वनिर्धारित SIM बाट फिर्ता कल"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"बहिर्गमन कलको लागि SIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"अन्य कल सेटिङहरू"</string>
@@ -2496,7 +2488,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"परिदृश्य दृष्टिकोणमा रहनुहोस्"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिमुखिकरणमा रहनुहोस्"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI जानकारी"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI सान्दर्भिक जानकारी"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"गुप्तिकरण"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"जारी राख्नुहोस्"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"यस उपकरणलाई अझै सुरक्षित गर्न सुरु गर्नु भन्दा अगि आफ्नो पिन आवश्यक बनाउन सक्नुहुने छ। उपकरण सुरु नभए सम्म कल, सन्देश, वा सूचनाहरू, प्राप्त गर्न सक्दैन, अलार्म सहित चल्ने छैन। \n\n उपकरण हराएको वा चोरी भएको खण्डमा यसले डेटा जोगाउँछ।"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ca7177c..a9a7acd 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ontkoppelen?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hierdoor wordt uw verbinding met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; verbroken"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"U heeft geen toestemming om de Bluetooth-instellingen te wijzigen."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is zichtbaar voor apparaten in de buurt terwijl \'Bluetooth-instellingen\' is geopend."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is zichtbaar voor apparaten in de buurt wanneer het venster \'Bluetooth-instellingen\' is geopend."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ontkoppelen?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitzending"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profiel uitschakelen?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wifi, Bluetooth, vliegmodus, mobiele netwerken en VPN\'s beheren"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobiele gegevens"</string>
     <string name="calls_title" msgid="3544471959217176768">"Oproepen"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Sms\'jes"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Sms\'jes"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Geg.gebruik via mobiel netwerk toestaan"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Geg.gebr. bij roaming toestaan"</string>
     <string name="roaming" msgid="3596055926335478572">"Gegevensroaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Gemiddelde tot zware beveiliging"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Wachtwoord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Zware beveiliging"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Functies voor apparaatbeveiliging werken niet meer."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Uitgeschakeld door beheerder, encryptiebeleid of referentieopslag"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Vegen"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ontgrendelingspatroon verwijderen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"PIN-code voor ontgrendelen verwijderen"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Ontgrendelingswachtwoord verwijderen"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Schermvergrendeling verwijderen"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ontgrendelingspatroon wijzigen"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"PIN-code voor ontgrendelen wijzigen"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ontgrendelingswachtwoord wijzigen"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Voor muziek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Instellingen onthouden"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Verbonden via wifi-assistent"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Scherm casten"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Draadloze weergave inschakelen"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Geen apparaten in de buurt gevonden."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wifi-instellingen"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wifi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Draadloze toegangspunten instellen en beheren"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wifi-netwerk selecteren"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wifi selecteren"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wifi inschakelen…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wifi uitschakelen…"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"WAARSCHUWING: als u wifi overslaat, gebruikt uw tablet alleen mobiele gegevens voor initiële downloads en updates. Maak verbinding met wifi om te voorkomen dat er gegevenskosten in rekening worden gebracht."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"WAARSCHUWING: als u wifi overslaat, gebruikt uw apparaat alleen mobiele gegevens voor initiële downloads en updates. Maak verbinding met wifi om te voorkomen dat er gegevenskosten in rekening worden gebracht."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"WAARSCHUWING: als u wifi overslaat, gebruikt uw telefoon alleen mobiele gegevens voor initiële downloads en updates. Maak verbinding met wifi om te voorkomen dat er gegevenskosten in rekening worden gebracht."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Als u wifi niet inschakelt:\n\nUw tablet heeft geen internetverbinding.\n\nU ontvangt pas software-updates nadat u verbinding maakt met internet.\n\nU kunt op dit moment geen apparaatbeschermingsfuncties activeren."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Als u wifi niet inschakelt:\n\nUw apparaat heeft geen internetverbinding.\n\nU ontvangt pas software-updates nadat u verbinding maakt met internet.\n\nU kunt op dit moment geen apparaatbeschermingsfuncties activeren."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Als u wifi niet inschakelt:\n\nUw telefoon heeft geen internetverbinding.\n\nU ontvangt pas software-updates nadat u verbinding maakt met internet.\n\nU kunt op dit moment geen apparaatbeschermingsfuncties activeren."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"De tablet kan geen verbinding maken met dit wifi-netwerk."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Het apparaat kan geen verbinding maken met dit wifi-netwerk."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"De telefoon kan geen verbinding maken met dit wifi-netwerk."</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Plaats een simkaart en start het apparaat opnieuw"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Maak verbinding met internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Mijn locatie"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Werkprofiel"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Locatie voor werkprofiel"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Uitgeschakeld door uw bedrijf"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Grote nauwkeurigheid"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Accubesparing"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Appgegevens opnemen"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisch terugzetten"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"In een back-up opgeslagen instellingen of andere gegevens herstellen bij het opnieuw installeren van een app"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Back-upservice is inactief."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Dit wordt ingesteld door uw apparaatbeleid."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Wachtwoord desktopback-up"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Volledige back-ups naar desktops zijn momenteel niet beveiligd"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Raak dit aan om het wachtwoord voor volledige back-ups naar desktops te wijzigen of te verwijderen"</string>
@@ -2319,8 +2313,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"Simkaart <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Simkaart leeg"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Naam van simkaart"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Voer de SIM-naam in"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Simkaartsleuf %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Provider"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nummer"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Paars"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Geen simkaarten geplaatst"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Simkaartstatus"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Simkaart-gerelateerde informatie"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Terugbellen via standaard-simkaart"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Simkaart voor uitgaande oproepen"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Andere instellingen voor bellen"</string>
@@ -2496,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI-informatie"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Relatieve IMEI-informatie"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Versleuteling"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Doorgaan"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"U kunt dit apparaat verder beveiligen door uw pincode te vereisen voordat het apparaat wordt opgestart. Het apparaat kan pas oproepen, berichten en meldingen, waaronder alarmen, ontvangen nadat het is opgestart. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4cffc18..4eaf731 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Rozłączyć?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Spowoduje to zakończenie połączenia z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nie masz uprawnień, by zmienić ustawienia Bluetootha."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> – widoczne dla urządzeń w pobliżu po otwarciu ustawień Bluetootha."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> jest widoczne dla urządzeń w pobliżu, gdy są otwarte ustawienia Bluetooth."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odłączyć urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisja"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wyłączyć profil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Zarządzaj Wi‑Fi, Bluetoothem, trybem samolotowym, sieciami komórkowymi i VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Komórkowa transmisja danych"</string>
     <string name="calls_title" msgid="3544471959217176768">"Połączenia"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS-y"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS-y"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Zezwalaj na komórkową transmisję danych"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Transmisja danych w roamingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming danych"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Średni i wysoki poziom zabezpieczeń"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Hasło"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Wysoki poziom zabezpieczeń"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funkcje chroniące urządzenie przestaną działać."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Wyłączone przez administratora lub ze względu na zasady szyfrowania albo magazyn danych logowania"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Brak"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Przesuń palcem"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Usuń wzór odblokowania"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Usuń kod PIN odblokowania"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Usuń hasło odblokowania"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Usuń blokadę ekranu"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Zmień wzór odblokowania"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmień kod PIN odblokowania"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmień hasło odblokowania"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Dla muzyki i multimediów"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamiętaj ustawienia"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asystent Wi‑Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Połączono przez Asystenta Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Ekran Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Wyświetlacz bezprzewodowy"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Brak urządzeń w pobliżu."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Ustawienia Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Konfiguruj punkty dostępowe sieci bezprzewodowej i zarządzaj nimi"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wybierz sieć Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wybierz Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Włączam Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wyłączam Wi-Fi…"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"OSTRZEŻENIE: jeśli nie dodasz sieci Wi‑Fi, tablet będzie pobierać oprogramowanie i aktualizacje tylko przez sieć komórkową. Aby uniknąć opłat za przesył danych, połącz się z Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"OSTRZEŻENIE: jeśli nie dodasz sieci Wi‑Fi, urządzenie będzie pobierać oprogramowanie i aktualizacje tylko przez sieć komórkową. Aby uniknąć opłat za przesył danych, połącz się z Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"OSTRZEŻENIE: jeśli nie dodasz sieci Wi‑Fi, telefon będzie pobierać oprogramowanie i aktualizację tylko przez sieć komórkową. Aby uniknąć opłat za przesył danych, połącz się z Wi-Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Jeśli pominiesz Wi‑Fi:\n\nTablet nie będzie mieć połączenia z internetem.\n\nNie będzie można pobrać aktualizacji oprogramowania, dopóki nie połączysz się z internetem.\n\nNie możesz obecnie włączyć funkcji ochrony urządzenia."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Jeśli pominiesz Wi‑Fi:\n\nUrządzenie nie będzie mieć połączenia z internetem.\n\nNie będzie można pobrać aktualizacji oprogramowania, dopóki nie połączysz się z internetem.\n\nNie możesz obecnie włączyć funkcji ochrony urządzenia."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Jeśli pominiesz Wi‑Fi:\n\nTelefon nie będzie mieć połączenia z internetem.\n\nNie będzie można pobrać aktualizacji oprogramowania, dopóki nie połączysz się z internetem.\n\nNie możesz obecnie włączyć funkcji ochrony urządzenia."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Urządzenie nie może połączyć się z tą siecią Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Włóż kartę SIM i zrestartuj urządzenie"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Połącz się z internetem"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokalizacja"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profil do pracy"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokalizacja dla profilu do pracy"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Wyłączone przez Twoją firmę"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Tryb lokalizacji"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Wysoka dokładność"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Oszczędzanie baterii"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Dołącz dane aplikacji"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Autoprzywracanie"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Przy ponownej instalacji aplikacji przywróć ustawienia i dane z kopii zapasowej."</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Usługa kopii zapasowych jest nieaktywna."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Jest to określone przez zasady dotyczące urządzeń."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Hasło kopii zapasowych"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Pełne kopie zapasowe na komputerze nie są obecnie chronione"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Wybierz, aby zmienić lub usunąć hasło pełnych kopii zapasowych na komputerze stacjonarnym."</string>
@@ -2319,8 +2313,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"Karta SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Karta SIM pusta"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nazwa karty SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Wpisz nazwę karty SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Gniazdo SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operator"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numer"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Fioletowy"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Brak włożonych kart SIM"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Stan karty SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informacje związane z kartą SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Oddzwoń za pomocą domyślnej karty SIM"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Karta SIM do połączeń wychodzących"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Inne ustawienia połączenia"</string>
@@ -2390,11 +2382,11 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Głośność alarmu"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Głośność dzwonka"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Głośność powiadomień"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Przerwy"</string>
-    <string name="zen_mode_option_title" msgid="5061978632306007914">"Gdy ktoś dzwoni i przychodzą powiadomienia"</string>
-    <string name="zen_mode_option_off" msgid="3167702608910820883">"Zawsze przerywaj"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Zezwalaj tylko na przerwy priorytetowe"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nie przerywaj"</string>
+    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Dozwolone dźwięki"</string>
+    <string name="zen_mode_option_title" msgid="5061978632306007914">"Gdy ktoś dzwoni lub przychodzi powiadomienie"</string>
+    <string name="zen_mode_option_off" msgid="3167702608910820883">"Zezwalaj na wszystkie dźwięki"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Zezwalaj na dźwięki priorytetowe"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nie zezwalaj na żadne dźwięki"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Dzwonek telefonu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Domyślny dzwonek powiadomień"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Wibracja podczas połączeń"</string>
@@ -2448,11 +2440,11 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Poufne"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotowe"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dopóki nie wyłączysz"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Przerwy priorytetowe"</string>
+    <string name="zen_mode_important_category" msgid="8123274463331022993">"Dźwięki priorytetowe"</string>
     <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Powiadomienia wyłączone"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dni"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Brak"</string>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Powiadomienia dozwolone"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Dozwolone powiadomienia"</string>
     <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Tylko priorytetowe"</string>
     <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Brak"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatyzacja"</string>
@@ -2461,12 +2453,12 @@
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nigdy"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Połączenia"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Wiadomości"</string>
-    <string name="zen_mode_from" msgid="1033337300289871697">"Połączenia/wiadomości od"</string>
+    <string name="zen_mode_from" msgid="1033337300289871697">"Połączenia lub wiadomości od"</string>
     <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Każdy"</string>
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Tylko kontakty"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Tylko kontakty z gwiazdką"</string>
     <string name="zen_mode_events" msgid="2456995649835437565">"Wydarzenia i przypomnienia"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmy mają zawsze priorytet"</string>
+    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Alarmy mają zawsze priorytet."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Włącz automatycznie"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nigdy"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Każdej nocy"</string>
@@ -2496,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Informacje o IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informacje związane z IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Szyfrowanie"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Dalej"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Możesz wzmocnić ochronę urządzenia przez wymaganie kodu PIN do jego uruchomienia. Dopiero po uruchomieniu urządzenie może odbierać połączenia, wiadomości czy powiadomienia, w tym alarmy. \n\nZwiększa to bezpieczeństwo danych na zgubionym lub skradzionym urządzeniu."</string>
diff --git a/res/values-pt-nokeys/strings.xml b/res/values-pt-nokeys/strings.xml
index 96d62c0..15c52f4 100644
--- a/res/values-pt-nokeys/strings.xml
+++ b/res/values-pt-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"Gerenciar aplicativos"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Gerenciar apps"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 87e06fb..a67f8be 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desligar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isto terminará a sua ligação com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Não tem autorização para alterar as definições de Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> é visível para dispositivos próximos enquanto Definições Bluetooth estiver aberto."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> é visível para dispositivos próximos enquanto as definições de Bluetooth estiverem abertas."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Desligar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Difusão"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desativar perfil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gerir Wi-Fi, Bluetooth, modo de avião, redes móveis e VPNs"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Dados de rede móvel"</string>
     <string name="calls_title" msgid="3544471959217176768">"Chamadas"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mensagens SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Mensagens SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Perm. utilizar dados através rede móvel"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Perm. utiliz. dados em roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de dados"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurança média a elevada"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Palavra-passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Segurança elevada"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"As funcionalidades de proteção do dispositivo deixarão de funcionar."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desativado p/ admin., política de encript. ou armazen. de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nenhum"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar rapidamente"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Remover palavra-passe de desbloqueio"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Remover bloqueio de ecrã"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrão de desbloqueio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Alterar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Alterar palavra-passe de desbloqueio"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorizar definições"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistente Wi-Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Ligado através do Assistente de Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Transmitir ecrã"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar display sem fios"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo nas proximidades."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Definições de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerir pontos de acesso sem fios"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Selecionar rede Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Selecionar Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"A ligar Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"A desligar Wi-Fi..."</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVISO: Se ignorar o Wi-Fi, o tablet utilizará apenas dados de rede móvel para as transferências e as atualizações iniciais. Para evitar possíveis taxas de dados, estabeleça ligação a uma rede Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVISO: Se ignorar o Wi-Fi, o dispositivo utilizará apenas dados de rede móvel para as transferências e as atualizações iniciais. Para evitar possíveis taxas de dados, estabeleça ligação a uma rede Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AVISO: Se ignorar o Wi-Fi, o telemóvel utilizará apenas dados de rede móvel para as transferências e as atualizações iniciais. Para evitar possíveis taxas de dados, estabeleça ligação a uma rede Wi-Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Se ignorar o Wi‑Fi:\n\nO seu tablet não terá uma ligação à Internet.\n\nNão receberá atualizações de software até se ligar à Internet.\n\nNeste momento, não pode ativar as funcionalidades de proteção do dispositivo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Se ignorar o Wi‑Fi:\n\nO seu dispositivo não terá uma ligação à Internet.\n\nNão receberá atualizações de software até se ligar à Internet.\n\nNeste momento, não pode ativar as funcionalidades de proteção do dispositivo."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Se ignorar o Wi‑Fi:\n\nO seu telemóvel não terá uma ligação à Internet.\n\nNão receberá atualizações de software até se ligar à Internet.\n\nNeste momento, não pode ativar as funcionalidades de proteção do dispositivo."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"O tablet não conseguiu estabelecer ligação a esta rede Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"O dispositivo não conseguiu estabelecer ligação a esta rede Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"O telemóvel não conseguiu estabelecer ligação a esta rede Wi-Fi."</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o cartão SIM e reinicie"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Ligue-se à Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"A minha localização"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Perfil de trabalho"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Local. para perfil de trabalho"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Desativado pela sua empresa"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisão"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Poupança de bateria"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluir dados de aplicações"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauro automático"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ao reinstalar uma aplicação, restaurar definições e dados da cópia de segurança"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"O serviço de cópia de segurança está inativo."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Isto é definido pela sua política do dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Palavra-passe cópia do comp."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"As cópias de segurança completas no ambiente de trabalho não estão atualmente protegidas"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toque para alterar ou remover a palavra-passe para cópias de segurança completas no ambiente de trabalho"</string>
@@ -2319,8 +2313,7 @@
     <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 vazio"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nome do SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Introduzir nome do SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Ranhura para cartão SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operador"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Roxo"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nenhum cartão SIM inserido"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Estado do SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informações relacionadas com o SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Ligar de volta de SIM predefinido"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM para chamadas efetuadas"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Outras definições de chamada"</string>
@@ -2496,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Informações do IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informações relativas do IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Encriptação"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"O utilizador pode proteger ainda mais este dispositivo, se solicitar o seu PIN antes do arranque. Até o dispositivo arrancar, não pode receber chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsto ajuda a proteger dados em dispositivos perdidos ou roubados."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ed73684..1742e8c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desconectar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isso encerrará sua conexão com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Você não tem permissão para alterar as configurações de Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> visível p/ disp. perto com configurações de Bluetooth abertas."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmissão"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desativar perfil?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gerenciar Wi-Fi, Bluetooth, modo avião, redes celulares e VPNs"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Dados da rede celular"</string>
     <string name="calls_title" msgid="3544471959217176768">"Chamadas"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mensagens SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Permitir uso de dados pela rede celular"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Permitir usar dados em roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de dados"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurança média a alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Senha"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Alta segurança"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Des. pelo adm., pol. de cript. ou armaz. de cred."</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nenhuma"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Remover senha de desbloqueio"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrão de desbloqueio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mudar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mudar senha de desbloqueio"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e mídia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configurações"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Assistente de Wi-Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conectado via assistente de Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Transmitir tela"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar Display sem fio"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo próximo encontrado."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Configurações de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerenciar pontos de acesso sem fio"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Selecionar rede Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Selecionar Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Ativando Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Desativando Wi-Fi..."</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Verificação sempre disponível"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Sempre permitir verificação"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permitir que o serviço de localização do Google e outros apps verifiquem redes, mesmo que o Wi-Fi esteja desligado"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Usar Wi-F aberto automaticamente"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Deixar um assistente Wi-Fi conectar-se automaticamente a redes abertas de alta qualidade"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Escolher assistente"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para aumentar a precisão da localização e para outras finalidades, o Google e outros apps podem verificar redes próximas, mesmo que o Wi-Fi esteja desligado. Para impedir, vá para \"Avançado &gt; Verificação sempre disponível\"."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Os apps podem verificar redes Wi-Fi próximas, mesmo que o Wi-Fi esteja desligado. Para impedir, vá para \"Avançado &gt; Verificação sempre disponível\"."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVISO: se você ignorar a configuração de Wi-Fi, o tablet usará somente dados da rede celular para fazer os downloads iniciais e as atualizações. Para evitar possíveis cobranças de dados, conecte-se ao Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVISO: se você ignorar a configuração de Wi-Fi, o dispositivo usará somente dados da rede celular para fazer os downloads iniciais e as atualizações. Para evitar possíveis cobranças de dados, conecte-se ao Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AVISO: se você ignorar a configuração de Wi-Fi, o smartphone usará somente dados da rede celular para fazer os downloads iniciais e as atualizações. Para evitar possíveis cobranças de dados, conecte-se ao Wi-Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Se pular Wi‑Fi:\n\nSeu tablet não terá conexão com a Internet.\n\nVocê não receberá atualizações de software enquanto não se conectar com a Internet.\n\nNão é possível ativar recursos de proteção de dispositivos no momento."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Se pular Wi‑Fi:\n\nseu dispositivo não terá uma conexão com a Internet.\n\nVocê não receberá atualizações de software enquanto não se conectar com a Internet.\nNão é possível ativar recursos de proteção de dispositivos\n no momento."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Se pular Wi‑Fi:\n\nseu smartphone não terá conexão com a Internet.\n\nVocê não receberá atualizações de software enquanto não se conectar com a Internet.\n\nNão é possível ativar recursos de proteção de dispositivos no momento."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"O tablet não foi capaz de conectar à rede Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Não foi possível conectar o dispositivo a essa rede Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"O telefone não foi capaz de conectar à rede Wi-Fi."</string>
@@ -836,8 +836,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
     <string name="doze_title" msgid="2259176504273878294">"Exibição de ambiente"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Ligar a tela ao pegar dispositivo ou receber notificações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamanho da fonte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
@@ -1017,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu telefone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps baixados"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
@@ -1092,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o cartão SIM e reinicie"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conecte-se à Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Meu Local"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Perfil de trabalho"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Local do perfil de trabalho"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Desativado por sua empresa"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisão"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economia de bateria"</string>
@@ -1857,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluir dados de apps"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauração automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ao reinstalar um app, restaura as configurações de backup e dados"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"O serviço de backup não está ativo."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Isto é definido pela política do seu dispositivo."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Senha do backup local"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Os backups completos do computador não estão protegidos no momento"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toque para alterar ou remover a senha de backups completos do desktop"</string>
@@ -2324,8 +2317,7 @@
     <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 vazio"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Nome do SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Inserir nome do SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM slot %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operadora"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
@@ -2335,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Roxo"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nenhum cartão SIM inserido"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status do SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informações relacionadas ao SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Retornar chamada com o SIM padrão"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM para chamadas de saída"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Outras configurações de chamada"</string>
@@ -2478,12 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noites em dias úteis"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Horário de início"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Horário de término"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ou qualquer alarme anterior"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte ou qualquer alarme anterior"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificações de apps"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
@@ -2504,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Informações de IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informações relativas de IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Criptografia"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Para proteger ainda mais o dispositivo, solicite um PIN ao ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e990a8d..add3db0 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Deconectaţi?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Astfel se va încheia conexiunea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nu aveți permisiunea de a modifica setările Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vizibil pt. disp. aprop. cât set. Bluetooth desc."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Deconectați <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmitere"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Dezactivaţi profilul?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gestionați Wi-Fi, funcția Bluetooth, modul Avion, rețelele mobile și VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Date mobile"</string>
     <string name="calls_title" msgid="3544471959217176768">"Apeluri"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mesaje SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Permiteți utilizarea datelor mobile"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Permiteți utiliz. date roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de date"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivel de securitate mediu spre ridicat"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parolă"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Securitate ridicată"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dezactivată de admin./politică de criptare/date de conectare"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Fără"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Glisare"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminaţi modelul pentru deblocare"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminaţi codul PIN de deblocare"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Eliminaţi parola de deblocare"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Schimbaţi modelul pentru deblocare"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Schimbaţi codul PIN de deblocare"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Schimbaţi parola pentru deblocare"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pentru muzică şi fişiere media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Reţineţi setările"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistent Wi-Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conexiune realizată printr-un asistent Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Proiectați ecranul"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activați ecranul wireless"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nu s-au găsit dispozitive în apropiere."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Setări Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configuraţi şi gestionaţi punctele de acces wireless"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Selectați rețeaua Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Selectați o rețea Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Se activează Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Se dezactivează Wi-Fi…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanare mereu disponibilă"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Permiteți întotdeauna scanarea"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Permiteți serviciului de localizare Google și altor aplicații să caute rețele, chiar dacă funcția Wi-Fi este dezactivată."</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Folosiți automat rețelele Wi‑Fi deschise"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permiteți ca un asistent Wi‑Fi să conecteze automat dispozitivul la rețele de calitate deschise"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Alegeți asistentul"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalați certificate"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pentru a îmbunătăți precizia locației, dar și în alte scopuri, Google și alte aplicații pot căuta rețele în apropiere, chiar dacă rețeaua Wi-Fi este dezactivată. Dacă nu doriți acest lucru, accesați Avansate &gt; Scanare mereu disponibilă."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplicațiile pot căuta rețele în apropiere, chiar dacă rețeaua Wi-Fi este dezactivată. Dacă nu doriți acest lucru, accesați Avansate &gt; Scanare mereu disponibilă."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, tableta dvs. va utiliza numai datele mobile pentru descărcările sau actualizările inițiale. Pentru a evita eventualele costuri pentru date, conectați-vă la Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, dispozitivul dvs. va utiliza numai datele mobile pentru descărcările sau actualizările inițiale. Pentru a evita eventualele costuri pentru date, conectați-vă la Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, telefonul dvs. va utiliza numai datele mobile pentru descărcările sau actualizările inițiale. Pentru a evita eventualele costuri pentru date, conectați-vă la Wi-Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Dacă nu folosiți Wi‑Fi:\n\ntableta nu va avea o conexiune la internet;\n\nnu veți primi actualizările de software decât după ce vă conectați la internet;\n\nnu puteți activa acum funcțiile de protecție a dispozitivului."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Dacă nu folosiți Wi‑Fi:\n\ndispozitivul nu va avea o conexiune la internet;\n\nnu veți primi actualizările de software decât după ce vă conectați la internet;\n\nnu puteți activa acum funcțiile de protecție a dispozitivului."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Dacă nu folosiți Wi‑Fi:\n\ntelefonul nu va avea o conexiune la internet;\n\nnu veți primi actualizările de software decât după ce vă conectați la internet;\n\nnu puteți activa acum funcțiile de protecție a dispozitivului."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tableta nu s-a putut conecta la această rețea Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Dispozitivul nu s-a putut conecta la această rețea Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonul nu s-a putut conecta la această rețea Wi-Fi."</string>
@@ -836,8 +836,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ridicați pentru a reactiva"</string>
     <string name="doze_title" msgid="2259176504273878294">"Afișare Ambient"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Activează ecranul când ridicați dispozitivul sau când primiți notificări"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensiune font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Dimensiune font"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setări de blocare a cardului SIM"</string>
@@ -1017,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a tabletei dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor;"</li>\n<li>"aplicaţiile descărcate."</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a telefonului dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor;"</li>\n<li>"aplicaţiile descărcate."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"În prezent sunteţi conectat(ă) la următoarele conturi:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Pe acest dispozitiv sunt prezenți și alți utilizatori.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzică"</li>\n<li>"Fotografii"</li>\n<li>"Alte date ale utilizatorului"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ştearsă."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie şters."</string>
@@ -1092,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Introduceți cartela SIM și reporniți"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conectați-vă la internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Locaţia mea"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profil de serviciu"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Locație pt. profil de serviciu"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Dezactivată de companie"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Precizie ridicată"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economisirea bateriei"</string>
@@ -1446,16 +1441,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ecranul nu va fi inactiv pe durata încărcării"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activați jurnalul de examinare HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Înregistrați toate pachetele HCI Bluetooth într-un fișier"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Deblocarea OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permiteți deblocarea bootloaderului"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Introduceți codul PIN"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Introduceți codul PIN al dispozitivului pentru a activa deblocarea OEM"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Permiteți deblocarea OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVERTISMENT: funcțiile de protecție a dispozitivului nu vor funcționa pe acest dispozitiv cât timp setarea este activată."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificare Ecran wireless"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Act. înr. prin Wi-Fi a vol. mari de date"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Înlocuire Wi-Fi cu mobil agresivă"</string>
@@ -1862,10 +1853,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Includeți datele aplicației"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restabilire automată"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"La reinstalarea unei aplicaţii, restabiliţi setările şi datele pentru care aţi creat o copie de rezervă"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Serviciul de backup este inactiv."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Acest serviciu este configurat de politica privind dispozitivele."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Parolă cop. rez. desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"În prezent, copiile de rezervă complete pe desktop nu sunt protejate"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Atingeţi pentru a modifica sau pentru a elimina parola pentru copiile de rezervă complete pe desktop"</string>
@@ -2017,10 +2006,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizaţi mereu GPU pentru compunerea ecranului"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulați spațiu culoare"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Monitorizări OpenGL"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Folosiți AwesomePlayer (vechi)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Folosiți AwesomePlayer, nu NuPlayer pt. redările media"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Dezact. rutarea audio USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Dezact. rutarea automată către perif. audio USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Afişaţi limite aspect"</string>
@@ -2331,8 +2318,7 @@
     <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">"Card SIM gol"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Numele cardului SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Introduceți numele cardului SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot pentru SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operator"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Număr"</string>
@@ -2342,7 +2328,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Violet"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nu a fost introdus niciun card SIM"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Starea cardului SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informații despre cardul SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Apelați de pe cardul SIM implicit"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Card SIM pentru apeluri efectuate"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Alte setări de apel"</string>
@@ -2485,12 +2470,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Serile zilelor lucr."</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ora de începere"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ora de încheiere"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"La <xliff:g id="FORMATTED_TIME">%s</xliff:g> a doua zi"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"La <xliff:g id="FORMATTED_TIME">%s</xliff:g> sau la oricare alarmă anterioară"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"La <xliff:g id="FORMATTED_TIME">%s</xliff:g> a doua zi sau la oricare alarmă anterioară"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificări aplicații"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setări pentru notificări"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Trimiteți feedback despre dispoz."</string>
@@ -2511,7 +2493,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Informații despre IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informații referitoare la IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Criptare"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuați"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând codul PIN pentru a-l porni. Nu se pot primi apeluri, mesaje sau notificări, nici alarme, pe dispozitiv până când acesta nu pornește. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6959973..b87be58 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Отключиться?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Произойдет разъединение с устройством &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"У вас нет разрешения на смену настроек Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Устройства поблизости могут обнаружить <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, пока открыты настройки Bluetooth."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Отключить <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Передача данных"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Отключить профиль?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Настройки Wi‑Fi, Bluetooth, режима полета, мобильных сетей и VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Мобильные данные"</string>
     <string name="calls_title" msgid="3544471959217176768">"Телефонные звонки"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Разрешить использовать мобильные данные"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Передавать данные в роуминге"</string>
     <string name="roaming" msgid="3596055926335478572">"Интернет-роуминг"</string>
@@ -330,7 +332,7 @@
     <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Нужно моргнуть, чтобы разблокировать экран"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Автоблокировка"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> после перехода в спящий режим"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"Через <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> после перехода в спящий режим, если экран не поддерживается в разблокированном состоянии службой <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>."</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> после перехода в спящий режим, если экран не поддерживается в разблокированном состоянии службой <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>."</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Показывать данные о владельце на экране блокировки"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Сведения о владельце"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Включить виджеты"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Запрещено администратором, политикой шифрования или хранилищем учетных данных"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Нет"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Провести по экрану"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Удалить графический ключ разблокировки"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Удалить ПИН-код разблокировки"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Удалить пароль разблокировки"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Изменить графический ключ разблокировки"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Изменить ПИН-код разблокировки"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Изменить пароль разблокировки"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музыки и мультимедиа"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомнить настройки"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Ассистент Wi‑Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Установлено подключение через Ассистента Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Беспроводной монитор"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Включить"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Устройства не найдены"</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Настройки Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Настройка и управление точками доступа беспроводной сети"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Выберите сеть Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Выбор сети Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Включение Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Отключение Wi-Fi…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Всегда искать сети"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Всегда искать сети"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Разрешить службе геопозиционирования Google и другим приложениям искать сети, даже когда модуль Wi‑Fi отключен"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Подключаться к открытым сетям Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Разрешить ассистенту Wi-Fi автоматически проверять открытые сети и подключаться к ним"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Выбор ассистента Wi-Fi"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Установка сертификатов"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Чтобы улучшить определение местоположения, а также для достижения других целей, Google и другие приложения могут выполнять поиск сетей поблизости, даже если сеть Wi-Fi отключена. Чтобы изменить эти настройки, перейдите в меню \"Дополнительно &gt; Всегда искать сети\"."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Приложения могут выполнять поиск сетей поблизости, даже если сеть Wi-Fi отключена. Чтобы изменить эти настройки, перейдите в меню \"Дополнительно &gt; Всегда искать сети\"."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ВНИМАНИЕ! Если вы не настроите Wi‑Fi, для скачивания приложений и обновлений будет использоваться мобильная сеть. Чтобы избежать лишних расходов, подключитесь к Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ВНИМАНИЕ! Если вы не настроите Wi‑Fi, для скачивания приложений и обновлений будет использоваться мобильная сеть. Чтобы избежать лишних расходов, подключитесь к Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ВНИМАНИЕ! Если вы не настроите Wi‑Fi, для скачивания приложений и обновлений будет использоваться мобильная сеть. Чтобы избежать лишних расходов, подключитесь к Wi-Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Если вы не настроите Wi‑Fi:\n\nПланшетный ПК не будет подключен к Интернету.\n\nПока подключение не восстановится, вы не сможете обновлять ПО.\n\nВы не сможете активировать защиту устройства."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Если вы не настроите Wi‑Fi:\n\nУстройство не будет подключено к Интернету.\n\nПока подключение не восстановится, вы не сможете обновлять ПО.\n\nВы не сможете активировать защиту устройства."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Если вы не настроите Wi‑Fi:\n\nТелефон не будет подключен к Интернету.\n\nПока подключение не восстановится, вы не сможете обновлять ПО.\n\nВы не сможете активировать защиту устройства."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Не удалось подключиться к сети Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Не удалось подключить устройство к этой сети Wi‑Fi"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Не удалось подключиться к сети Wi-Fi."</string>
@@ -836,8 +836,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автонастройка"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Активация в вертикальном положении"</string>
     <string name="doze_title" msgid="2259176504273878294">"Запрет спящего режима"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Включение дисплея, когда вы берете устройство в руки или получаете уведомление"</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>
@@ -1017,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Аккаунты, добавленные на этом устройстве:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На этом устройстве есть другие аккаунты пользователей.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музыка"</li>\n<li>"Фото"</li>\n<li>"Другие данные"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"USB-накопитель"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Чтобы удалить музыку, фотографии и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."</string>
@@ -1092,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Вставьте SIM-карту и перезагрузите устройство"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Подключитесь к Интернету"</string>
     <string name="location_title" msgid="1029961368397484576">"Мое местоположение"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Рабочий профиль"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Место для рабочего профиля"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Отключено администратором"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"По всем источникам"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"По координатам сети"</string>
@@ -1445,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Во время зарядки экран будет всегда включен"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Включить журнал трансляции операций HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сохранять все пакеты HCI Bluetooth в файле"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Заводская разблокировка"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Разрешить разблокировку загрузчика ОС"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Введите PIN-код"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Введите PIN-код устройства, чтобы разрешить заводскую разблокировку"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Разрешить заводскую разблокировку?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ВНИМАНИЕ! Функции защиты не будут работать на устройстве, пока включен этот параметр."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Серт. беспроводн. мониторов"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Подробные сведения в журнале Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Переключаться на мобильную сеть"</string>
@@ -1861,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Учитывать данные приложений"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автовосстановление"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"При переустановке приложения восстановить резервную копию настроек и данных"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Служба резервного копирования неактивна"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"В соответствии с политикой устройства."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль для резервного копирования"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Полные резервные копии в настоящее время не защищены"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Изменить или удалить пароль для резервного копирования"</string>
@@ -2016,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Всегда использовать GPU при компоновке экрана"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Имитировать аномалию"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Вкл. трассировку OpenGL"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Использовать AwesomePlayer (устаревший параметр)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Использовать AwesomePlayer вместо NuPlayer для воспроизведения большинства файлов мультимедиа"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Откл. передачу аудио (USB)"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Откл. автом. маршрутизацию на внеш. USB-устройства"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Показывать границы элементов"</string>
@@ -2330,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Укажите название SIM-карты"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Слот для SIM-карты %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Номер"</string>
@@ -2341,7 +2327,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"Другие настройки звонков"</string>
@@ -2484,12 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Вечером по будням"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Время начала"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Время окончания"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"На следующий день в <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"В <xliff:g id="FORMATTED_TIME">%s</xliff:g> или при первом срабатывании будильника"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"В <xliff:g id="FORMATTED_TIME">%s</xliff:g> на следующий день или при первом срабатывании будильника"</string>
     <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>
@@ -2510,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Зафиксировать в горизонтальной ориентации"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Зафиксировать в текущей ориентации"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Данные IMEI-кода"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Сведения, касающиеся IMEI-кода"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифрование"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Продолжить"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Для защиты данных вы можете активировать запрос PIN-кода при включении. Звонки, сообщения и оповещения, в том числе будильники, будут недоступны, пока вы не разблокируете устройство.\n\nЭто помогает защитить данные на утерянном или украденном устройстве."</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 8d51ff5..fa9c901 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"විසන්ධි කරන්නද?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"මෙය &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; සමඟ ඔබගේ සම්බන්ධය අවසන් කරනු ඇත"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"බ්ලූටූත් සැකසීම් වෙනස් කිරීමට ඔබට අවසර නැත."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"බ්ලූටූත් සැකසීම් විවෘත කරන අතරතුර ආසන්න උපකරණ වලට <xliff:g id="DEVICE_NAME">%1$s</xliff:g> එක දර්ශනය වේ."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> විසන්ධි කරද?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"විකාශනය කරමින්"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"අක්‍රිය පැතිකඩක්ද?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi-Fi, බ්ලූටූත්, අහස්යානා අකාරය, සෙලියුලර් ජාල, සහ VPN කළමණාකරණය කරන්න"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"සෙලියුලර් දත්ත"</string>
     <string name="calls_title" msgid="3544471959217176768">"ඇමතුම්"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS පණිවිඩ"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"සෙලියුලර් ජාලය හරහා දත්ත භාවිතයට ඉඩ දෙන්න"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"රෝමිං විට දත්ත භාවිත කිරීමේ ඉඩ දෙන්න"</string>
     <string name="roaming" msgid="3596055926335478572">"දත්ත රෝමින්"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"පරිපාලකයා, සංකේතන ප්‍රතිපත්තිය, හෝ අක්තපත්‍ර ආචයනය මඟින් අබල කර ඇත"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"කිසිවක් නැත"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ස්වයිප් කරන්න"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"අගුළු ඇරීමේ මුරපදය ඉවත් කරන්න"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"අඟුළු හැරීමේ මුරපදය වෙනස් කරන්න"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"සංගීතය සහ මාධ්‍යය සඳහා"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"සැකසීම් මතක තබාගන්න"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi සහායක"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi සහායක හරහා සම්බන්ධ කරන ලදි"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"රංගන තිරය"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"රැහැන් රහිත දර්ශනය සබල කරන්න"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"කිසිඳු උපාංගයක් අවටින් සොයාගත්තේ නැත."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi සැකසුම්"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"රැහැන් රහිත ප්‍රවේශ තැන් සකසන්න සහ කළමනාකරණය කරන්න"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi ජාලය තෝරන්න"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi-Fi තෝරන්න"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi සක්‍රිය කරමින්..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi අක්‍රිය කරමින්..."</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"පරිලෝකනය සැමවිට ලබාගත හැක"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"සැමවිටම පරිලෝකනය කිරීමට ඉඩ දෙන්න"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-Fi අක්‍රිය විටත් Google ගේ ස්ථාන සේවා සහ වෙනත් යෙදුම් ජාල සඳහා පරිලෝකනය කරන්න"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"විවෘත Wi‑Fi ස්වයංක්‍රියව භාවිතා කරන්න"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"විවෘත ජාල තත්ත්වයෙන් උසස් යැයි නිර්ණය කර ඒවාට ස්වයංක්‍රියව සම්බන්ධ වීමට Wi‑Fi සහායකට ඉඩ දෙන්න"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"සහායක තෝරන්න"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"සහතික ස්ථාපනය කරන්න"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"ස්ථාන නිරවද්‍යතාවය වැඩි කිරීමට සහ වෙනත් අරමුණු සඳහා Wi-Fi අක්‍රිය වුවද, Google සහ අනෙකුත් යෙදුම් ආසන්න ජාල සඳහා පරිලෝකනය කරයි. ඔබට මෙය සිදු වීමට අවශ්‍ය නොවේ නම්, උසස් &gt; පරිලෝකනය සැමවෙලේම පවතී."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-Fi අක්‍රිය විටදී පවා යෙදුම් ආසන්න ජාල සඳහා පරිලෝකනය කරනු ඇත. ඔබ මෙය සිදුවනවාට අකමැති නම්, උසස් &gt; පරිලෝකනය සෑමවිටම පවතී වෙත යන්න."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"අවවාදයයි: ඔබ Wi‑Fi මඟ හැරියා නම්, මුල් බාගැනීම් හෝ යාවත්කාලීන කිරීම් සඳහා ඔබගේ ටැබ්ලටය සෙලියුලර් දත්ත පමණක් භාවිතා කරයි. අය විය හැකි දත්ත වැළක්වීමට Wi‑Fi වෙත සම්බන්ධ වෙන්න."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"අවවාදයයි: ඔබ Wi‑Fi මඟ හැරියා නම්, මුල් බාගැනීම් හෝ යාවත්කාලීන කිරීම් සඳහා ඔබගේ උපාංගය සෙලියුලර් දත්ත පමණක් භාවිතා කරයි. අය විය හැකි දත්ත වැළක්වීමට Wi‑Fi වෙත සම්බන්ධ වෙන්න."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"අවවාදයයි: ඔබ Wi‑Fi මඟ හැරියා නම්, මුල් බාගැනීම් හෝ යාවත්කාලීන කිරීම් සඳහා ඔබගේ දුරකථනය සෙලියුලර් දත්ත පමණක් භාවිතා කරයි. අය විය හැකි දත්ත වැළක්වීමට Wi‑Fi වෙත සම්බන්ධ වෙන්න."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"ඔබ Wi‑Fi මගහැර ගියහොත්:\n\nඔබගේ ටැබ්ලටයට අන්තර්ජාල සබඳතාවක් නොතිබෙනු ඇත.\n\nඔබගේ අන්තර්ජාලයට සම්බන්ධ වන තුරු ඔබට මෘදුකාංග යාවත්කාලීන කිරීම් නොලැබෙනු ඇත.\n\nඔබට මේ මොහොතේ උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කළ නොහැක."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"ඔබ Wi‑Fi මගහැර ගියහොත්:\n\nඔබගේ උපාංගයට අන්තර්ජාල සබඳතාවක් නොතිබෙනු ඇත.\n\nඔබගේ අන්තර්ජාලයට සම්බන්ධ වන තුරු ඔබට මෘදුකාංග යාවත්කාලීන කිරීම් නොලැබෙනු ඇත.\n\nඔබට මේ මොහොතේ උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කළ නොහැක."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"ඔබ Wi‑Fi මගහැර ගියහොත්:\n\nඔබගේ දුරකථනයට අන්තර්ජාල සබඳතාවක් නොතිබෙනු ඇත.\n\nඔබගේ අන්තර්ජාලයට සම්බන්ධ වන තුරු ඔබට මෘදුකාංග යාවත්කාලීන කිරීම් නොලැබෙනු ඇත.\n\nඔබට මේ මොහොතේ උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කළ නොහැක."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ටැබ්ලටයට මෙම Wi-Fi ජාලයට සම්බන්ධ වීමට නොහැකි වී ඇත."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"මෙම Wi-Fi ජාලය වෙත සම්බන්ධ වීමට උපාංගයට නොහැකි විය."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"මෙම Wi-Fi ජාලය වෙත සම්බන්ධ වීමට දුරකථනයට නොහැකි විය."</string>
@@ -1016,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ඔබගේ ටැබ්ලටයේ "<b>"අභ්‍යන්තර ආචනය"</b>", සියලු දත්ත මකයි:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත යෙදුම්"</li>" අන්තර්ගතය."</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"මෙය ඔබගේ දුරකථනයේ "<b>"අභ්‍යන්තර ගබඩාවේ"</b>" සියලු දත්ත මකයි:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත යෙදුම්"</li>" අන්තර්ගතය."</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ඔබ දැනට පහත ගිණුම් වෙත පුරනය වී සිටියි:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"මෙම උපාංගයේ වෙනත් පරිශීලකයින් සිටි.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"සංගීතය"</li>\n<li>"ඡායාරූප"</li>\n<li>"වෙනත් පරිශීලක දත්ත"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"සංගීත, පින්තූර, සහ වෙනත් පරිශීලක දත්ත මැකීමට, "<b>"USB ආචයනය"</b>" මැකීමට අවශ්‍යය."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"සංගීතය, පින්තූර, සහ වෙනත් පරිශීලක දත්ත ඉවත් කිරීමට, "<b>"SD කාඩ් පත"</b>" මැකිය යුතුවේ."</string>
@@ -1093,12 +1092,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"කරුණාකර SIM කාඩ් පතක් ඇතුල් කරන්න සහ නැවත අරඹන්න"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"කරුණාකර අන්තර්ජාලය වෙත සම්බන්ධ වන්න"</string>
     <string name="location_title" msgid="1029961368397484576">"මගේ ස්ථානය"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"කාර්යාල පැතිකඩ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"කාර්යාල පැතිකඩ සඳහා ස්ථානය"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"ඔබගේ සමාගම මගින් අක්‍රිය කර ඇත"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"ආකාරය"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ඉහළ නිරවද්‍යතාවය"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"බැටරි සුරැකීම"</string>
@@ -1858,10 +1854,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"යෙදුම් දත්ත ඇතුළත් කරන්න"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ස්වයංක්‍රීය යළි පිහිටුවීම"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"යෙදුමක් නැවත ස්ථාපනය කරද්දී, උපස්ථ කළ සැකසීම් සහ දත්ත නැවත පිහිටුවන්න"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"උපස්ථ සේවය අක්‍රිය වේ."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"මෙය ඔබගේ උපාංග ප්‍රතිපත්තිය සමග සකසා ඇත."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ඩෙස්ක්ටොප් උපස්ථ මුරපදය"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ඩෙස්ක්ටොප් සම්පූර්ණ උපස්ථ දැනට ආරක්ෂා කර නොමැත"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ඩෙස්ක්ටොප් සම්පූර්ණ උපස්ථ සඳහා මුරපදය වෙනස් කිරීමට හෝ ඉවත් කිරීමට ස්පර්ශ කරන්න"</string>
@@ -2325,8 +2319,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM නම ඇතුළත් කරන්න"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM විවරය %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"වාහකයා"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"අංකය"</string>
@@ -2336,7 +2329,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"වෙනත් ඇමතුම් සැකසුම්"</string>
@@ -2502,7 +2494,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"තිරස් දසුන තුළ සිටින්න"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"දැනට තිබෙන දිශානතියේ සිටින්න"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI තොරතුරු"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI සාපේක්ෂ තොරතුරු"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"සංකේතනය"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ඉදිරියට යන්න"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"උපාංගය ආරම්භ වීමට පෙර ඔබගේ PIN එක අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැක. උපාංගය ආරම්භ වන තෙක්, එයට සීනු ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබාගත නොහැක.\n\nනැතිවූ හෝ සොරකම් කළ උපාංග වල දත්ත ආරක්ෂා කිරීමට මෙය උදව් කරයි."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4b1f9c4..51d4e77 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Odpojiť?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Táto akcia ukončí vaše pripojenie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nemáte povolenie na zmenu nastavení Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Pri otvorených nastaveniach Bluetooth je zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> viditeľné pre zariadenia v okolí."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odpojiť zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Vysielanie"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Zakázať profil?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Spravovať sieť Wi-Fi, rozhranie Bluetooth, režim v lietadle, mobilné siete a siete VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobilné dáta"</string>
     <string name="calls_title" msgid="3544471959217176768">"Hovory"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Správy SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Povoliť využitie dát cez mobilnú sieť"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Povoliť využ. dát pri roamingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Dátový roaming"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Stredné až vysoké zabezpečenie"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Vysoké zabezpečenie"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Zakázané správcom, pravidlom šifrovania alebo úložiskom poverení"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Žiadne"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Prejdenie prstom"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odstrániť bezpečnostný vzor"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odstrániť bezpečnostný kód PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Odstrániť bezpečnostné heslo"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Zmena bezpečnostného vzoru"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmena bezpečnostného kódu PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmeniť bezpečnostné heslo"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pre hudbu a médiá"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamätať nastavenia"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Pripojené pomocou Asistenta Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Prenos obrazovky"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Povoliť bezdrôtový displej"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V okolí sa nenašli žiadne zariadenia."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavenia Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Umožňuje nastaviť a spravovať prístupové body bezdrôtovej siete"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Výber siete Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Vybrať sieť Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Prebieha zapínanie siete Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Prebieha vypínanie Wi-Fi..."</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Vyhľadávanie vždy zapnuté"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Vyhľadávanie vždy zapnuté"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Povoliť službe určovania polohy Google a ostatným aplikáciám vyhľadávať siete aj v prípade, že je sieť Wi-Fi vypnutá"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Automaticky používať otvor. siete Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Umožniť asistentovi Wi‑Fi automaticky sa pripojiť k otvoreným sieťam, ktoré určí ako vysokokvalitné"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Výber asistenta"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Inštalácia certifikátov"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Služby Google a ďalšie aplikácie môžu s cieľom zvýšenia presnosti a inými cieľmi vyhľadávať siete v blízkosti aj v prípade, že je sieť Wi-Fi vypnutá. Ak chcete nastavenie zmeniť, prejdite do časti Rozšírené &gt; Vyhľadávanie vždy zapnuté"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikácie môžu vyhľadávať siete v blízkosti aj v prípade, že je sieť Wi-Fi vypnutá. Ak chcete nastavenie zmeniť, prejdite do časti Rozšírené &gt; Vyhľadávanie vždy zapnuté."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"UPOZORNENIE: Ak nastavenie siete Wi‑Fi preskočíte, tablet na stiahnutie počiatočných súborov a aktualizácií použije iba mobilné dátové pripojenie. Ak chcete zabrániť možným poplatkom za prenos dát, pripojte sa k sieti Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"UPOZORNENIE: Ak nastavenie siete Wi‑Fi preskočíte, zariadenie na stiahnutie počiatočných súborov a aktualizácií použije iba mobilné dátové pripojenie. Ak chcete zabrániť možným poplatkom za prenos dát, pripojte sa k sieti Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"UPOZORNENIE: Ak nastavenie siete Wi‑Fi preskočíte, telefón na stiahnutie počiatočných súborov a aktualizácií použije iba mobilné dátové pripojenie. Ak chcete zabrániť možným poplatkom za prenos dát, pripojte sa k sieti Wi-Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ak preskočíte pripojenie Wi‑Fi:\n\nváš tablet nebude pripojený k internetu;\n\naktualizácie softvéru získate až po pripojení k internetu;\n\nnebudete môcť aktivovať funkcie ochrany zariadenia."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ak preskočíte pripojenie Wi‑Fi:\n\nvaše zariadenie nebude pripojené k internetu;\n\naktualizácie softvéru získate až po pripojení k internetu;\n\nnebudete môcť aktivovať funkcie ochrany zariadenia."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ak preskočíte pripojenie Wi‑Fi:\n\nváš telefón nebude pripojený k internetu;\n\naktualizácie softvéru získate až po pripojení k internetu;\n\nnebudete môcť aktivovať funkcie ochrany zariadenia."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet sa k tejto sieti Wi-Fi nedokázal pripojiť."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Zariadenie sa k tejto sieti Wi-Fi nedokázalo pripojiť."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefón sa k tejto sieti Wi-Fi nedokázal pripojiť."</string>
@@ -836,8 +836,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Prebudiť zdvihnutím"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambientné zobrazenie"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Zobudiť obrazovku pri zodvihnutí zariadenia alebo prijatí upozornení"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Veľkosť písma"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavenia zámky karty SIM"</string>
@@ -1017,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" tabletu, vrátane:\n\n"<li>"účtu Google"</li>\n<li>"údajov a nastavení systému a aplikácií"</li>\n<li>"prevzatých aplikácií"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" telefónu, vrátane:\n\n"<li>"účtu Google"</li>\n<li>"údajov a nastavení systému a aplikácií"</li>\n<li>"prevzatých aplikácií"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálne ste prihlásení do nasledujúcich účtov:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Na tomto zariadení sú prítomní ďalší používatelia.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotografie"</li>\n<li>"Iné používateľské údaje"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské údaje, musíte vymazať "<b>"úložisko USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské údaje, musíte vymazať "<b>"kartu SD"</b>"."</string>
@@ -1092,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vložte kartu SIM a reštartujte"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Pripojte sa k internetu"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja poloha"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Pracovný profil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Poloha pre pracovný profil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Deaktivovala vaša spoločnosť"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Režim"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Vysoká presnosť"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Úspora batérie"</string>
@@ -1445,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka sa pri nabíjaní neprepne do režimu spánku"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Povoliť sledovanie Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zaznamenať všetky pakety Bluetooth HCI do súboru"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Odblokovať OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Povoliť odblokovanie ponuky bootloader"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Zadajte svoj kód PIN"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ak chcete aktivovať odomknutie OEM, zadajte kód PIN zariadenia"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Povoliť odblokovanie OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORNENIE: V prípade, že bude toto nastavenie zapnuté, funkcie ochrany zariadenia nebudú na tomto zariadení fungovať."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikácia bezdrôtového displeja"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Povoliť prihlasovanie Wi-Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agres. odovzdávať Wi-Fi na mobilnú sieť"</string>
@@ -1861,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Zahrnúť dáta aplikácií"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatické obnovenie"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri preinštalovaní aplikácie obnoviť zálohované údaje a nastavenia"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Služba zálohovania nie je aktívna."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Túto možnosť nastavujú pravidlá pre zariadenie."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Heslo záloh v počítači"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Úplné zálohy na počítači nie sú momentálne chránené"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dotykom zmeníte alebo odstránite heslo pre úplné zálohy do počítača"</string>
@@ -2016,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy používať GPU na skladanie obrazovky"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simulácia far. priestoru"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Trasovanie OpenGL"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Použiť AwesomePlayer (zastarané)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Použiť na prehrávanie médií AwesomePlayer (nie NuPlayer)"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Vyp. smer. zvuku do USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Vyp. aut. smer. zvuku do zvukových periférií USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Zobraziť ohraničenia"</string>
@@ -2330,8 +2317,7 @@
     <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ázdna"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Názov SIM karty"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Zadajte názov SIM karty"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot pre SIM kartu %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operátor"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Číslo"</string>
@@ -2341,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Purpurová"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nie sú vložené žiadne SIM karty"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Stav SIM karty"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Informácie týkajúce sa SIM karty"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Volať späť z predvolenej SIM karty"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM karta pre odchádzajúce hovory"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Ďalšie nastavenia hovorov"</string>
@@ -2484,15 +2469,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noci cez týždeň"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Čas začiatku"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Čas ukončenia"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nasledujúci deň"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> alebo ľubovoľný predchádzajúci budík"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nasledujúci deň alebo ľubovoľný predchádzajúci budík"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Upozornenia apl."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
-    <string name="device_feedback" msgid="3238056036766293294">"Odoslať názor o tomto zariadení"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"Odoslať spätnú vazbu k tomuto zariadení"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Zadajte číslo PIN správcu"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Zapnuté"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Vypnuté"</string>
@@ -2510,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Informácie o kóde IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informácie súvisiace s kódom IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Šifrovanie"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Pokračovať"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Ďalšiu ochranu tohto zariadenia zabezpečíte požadovaním kódu PIN pred spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí. \n\nPomáha to chrániť údaje na stratených alebo ukradnutých zariadeniach."</string>
diff --git a/res/values-sl-nokeys/strings.xml b/res/values-sl-nokeys/strings.xml
index 49e27e3..4f73cd7 100644
--- a/res/values-sl-nokeys/strings.xml
+++ b/res/values-sl-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"Upravljanje programov"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Upravljanje aplikacij"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 6160da2..092cf3c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Želite prekiniti povezavo?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"S tem bo prekinjena povezava z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Nimate dovoljenja za spreminjanje nastavitev za Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je vidna napravam v bližini, ko so odprte nastavitve za Bluetooth."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je vidna napravam v bližini, ko so odprte nastavitve za Bluetooth."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ali želite prekiniti povezavo z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Oddajanje"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Želite onemogočiti profil?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Upravljanje Wi-Fi-ja, Bluetootha, načina za letalo, mobilnih omrežij in omrežij VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Prenos podatkov v mob. omrež."</string>
     <string name="calls_title" msgid="3544471959217176768">"Klici"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Sporočila SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Sporočila SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Dovoli prenos podatkov v mobil. omrežju"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Dovoli prenos podat. med gost."</string>
     <string name="roaming" msgid="3596055926335478572">"Podatkovno gostovanje"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Srednja do visoka varnost"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Geslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Visoka varnost"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funkcije za zaščito naprave ne bodo več delovale."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onem. skrbnik, šifr. pravilnik shr. poverilnic"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Brez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Vlečenje"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odstrani vzorec za odklepanje"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odstrani kodo PIN za odklepanje"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Odstrani geslo za odklepanje"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Odstrani zaklepanje zaslona"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Spremeni vzorec za odklepanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Spremeni kodo PIN za odklepanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Spremeni geslo za odklepanje"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glasbo in predstavnost"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapomni si nastavitve"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Pomočnik za Wi‑Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Povezava vzpostavljena prek pomočnika za Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Zaslon za predvajanje"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogočanje brezžičnega zaslona"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V bližini ni naprav."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavitve za Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Nastavi in upravljaj brezžične dostopne točke"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Izberi omrežje Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Izberi Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Vklapljanje povezave Wi‑Fi …"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Izklapljanje povezave Wi‑Fi …"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"OPOZORILO: Če preskočite povezavo Wi‑Fi, bo tablični računalnik za začetne prenose in posodobitve uporabljal prenos podatkov v mobilnem omrežju. Če se želite izogniti morebitnim stroškom za prenos podatkov, se povežite v omrežje Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"OPOZORILO: Če preskočite povezavo Wi‑Fi, bo naprava za začetne prenose in posodobitve uporabljala prenos podatkov v mobilnem omrežju. Če se želite izogniti morebitnim stroškom za prenos podatkov, se povežite v omrežje Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"OPOZORILO: Če preskočite povezavo Wi‑Fi, bo telefon za začetne prenose in posodobitve uporabljal prenos podatkov v mobilnem omrežju. Če se želite izogniti morebitnim stroškom za prenos podatkov, se povežite v omrežje Wi-Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Če preskočite Wi‑Fi:\n\nv tabličnem računalniku ne bo na voljo internetna povezava.\n\nDokler ne vzpostavite internetne povezave, ne boste prejemali posodobitev programske opreme.\n\nTrenutno ni mogoče aktivirati zaščitnih funkcij naprave."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Če preskočite Wi‑Fi:\n\nv napravi ne bo na voljo internetna povezava.\n\nDokler ne vzpostavite internetne povezave, ne boste prejemali posodobitev programske opreme.\n\nTrenutno ni mogoče aktivirati zaščitnih funkcij naprave."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Če preskočite Wi‑Fi:\n\nv telefonu ne bo na voljo internetna povezava.\n\nDokler ne vzpostavite internetne povezave, ne boste prejemali posodobitev programske opreme.\n\nTrenutno ni mogoče aktivirati zaščitnih funkcij naprave."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablični računalnik se ni mogel povezati v to omrežje Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Naprava se ni mogla povezati v to omrežje Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon se ni mogel povezati v to omrežje Wi-Fi."</string>
@@ -833,8 +832,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Preklop iz stanja pripravlj. z dviganjem"</string>
     <string name="doze_title" msgid="2259176504273878294">"Prikaz na podlagi okolja"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Preklop zaslona iz stanja pripravljenosti, ko primete napravo ali prejmete obvestila"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Velikost pisave"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavitve zaklepanja kartice SIM"</string>
@@ -1088,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vstavite SIM in znova zaženite"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Vzpostavite internetno povezavo"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Delovni profil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Mesto za delovni profil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Izklopilo podjetje"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Način"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka natančnost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Varč. z energijo akumulatorja"</string>
@@ -1853,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Vključi podatke aplikacije"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Samodejna obnovitev"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri vnovični namestitvi aplikacije obnovite varnostno kopirane nastavitve in podatke"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Storitev za varnostno kopiranje je nedejavna."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"To je nastavljeno s pravilnikom za naprave."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Geslo za varn. kop. rač."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Popolne varnostne kopije namizja trenutno niso zaščitene"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dotaknite se, če želite spremeniti ali odstraniti geslo za popolno varnostno kopiranje namizja."</string>
@@ -2008,7 +2001,7 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Za sestavljanje slike vedno uporabi graf. procesor"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Simul. barvnega prostora"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogoči sledi OpenGL"</string>
-    <string name="use_awesomeplayer" msgid="1583337008516364226">"Uporaba AwesomePlayerja (zastarelo)"</string>
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Uporabi AwesomePlayer (zastarelo)"</string>
     <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Uporaba AwesomePlayerja namesto NuPlayerja za predvajanje večine predstavnosti"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"On. us. zvoka prek USB-ja"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Onem. samod. usmerjanja na zun. zvoč. naprave USB"</string>
@@ -2320,8 +2313,7 @@
     <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">"Kartica SIM je prazna"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Ime kartice SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Vnesite ime kartice SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Reža za SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operater"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Številka"</string>
@@ -2331,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Vijolična"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Ni vstavljenih kartic SIM"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Stanje kartice SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Podatki, povezani s kartico SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Povratni klic s privzete kartice SIM"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Kartica SIM za odhodne klice"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Druge nastavitve klicev"</string>
@@ -2474,12 +2465,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noči med tednom"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ura začetka"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ura konca"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> naslednji dan"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ali kateri koli alarm prej"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> naslednji dan ali kateri koli alarm prej"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Obvestila aplikacij"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavitve obvestil"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošlji povratne info. o tej napravi"</string>
@@ -2500,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Podatki o IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Relativni podatki o IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Šifriranje"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Naprej"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Napravo lahko še dodatno zaščitite, tako da je treba pred zagonom naprave vnesti kodo PIN. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo pomaga pri zaščiti podatkov, če naprave izgubite ali jih ukradejo."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 8738506..2a61ac3 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Желите ли да прекинете везу?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Овим ћете прекинути везу са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Немате дозволу за промену подешавања Bluetooth-а."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> је видљив уређајима у близини док су Bluetooth подешавања отворена."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Желите ли да прекинете везу са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Емитовање"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Желите ли да онемогућите профил?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Управљање Wi-Fi-јем, Bluetooth-ом, режимом рада у авиону, мобилним мрежама и VPN-овима"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Подаци за мобилне уређаје"</string>
     <string name="calls_title" msgid="3544471959217176768">"Позиви"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS поруке"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Омогућав. потрош. подат. на мобил. мрежи"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Дозволи потр. подат. у ромингу"</string>
     <string name="roaming" msgid="3596055926335478572">"Пренос подат. у ромингу"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Онемогућио администратор, смернице за шифровање или складиштење акредитива"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ништа"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Превуците"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"Уклањање лозинке за откључавање"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"Промена лозинке за откључавање"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"За музику и медије"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запамти подешавања"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Повезано преко Wi‑Fi помоћника"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Пребацивање екрана"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Омогући бежични приказ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Нема уређаја у близини."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi подешавања"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Подешавање и управљање бежичним приступним тачкама"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Изаберите Wi-Fi мрежу"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Изабери Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Укључивање Wi-Fi-ја..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Искључивање Wi-Fi-ja..."</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Скенирање је увек доступно"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Увек дозвољавај скенирање"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Дозволите Google-овој услузи лоцирања и другим апликацијама да скенирају мреже, чак и када је Wi-Fi искључен"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Аутоматски користи отворени Wi‑Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Омогућ. аутоматског повезивања са отвореним мрежама које се покажу као квалитетне за Wi‑Fi помоћника"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Изаберите помоћника"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Инсталирај сертификате"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Да би, између осталог, побољшале тачност локације, Google и друге апликације могу да скенирају оближње мреже, чак и када је Wi-Fi искључен. Ако не желите да се то дешава, идите на Напредно &gt; Скенирање је увек доступно."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Апликације могу да скенирају оближње мреже, чак и када је Wi-Fi искључен. Ако не желите да се то дешава, идите на Напредно &gt; Скенирање је увек доступно."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"УПОЗОРЕЊЕ: Ако прескочите Wi‑Fi, таблет ће користити само податке за мобилне уређаје при почетним ажурирањима и преузимањима. Да бисте избегли евентуалне трошкове за пренос података, повежите се са Wi‑Fi-јем."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"УПОЗОРЕЊЕ: Ако прескочите Wi‑Fi, уређај ће користити само податке за мобилне уређаје при почетним ажурирањима и преузимањима. Да бисте избегли евентуалне трошкове за пренос података, повежите се са Wi‑Fi-јем."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"УПОЗОРЕЊЕ: Ако прескочите Wi‑Fi, телефон ће користити само податке за мобилне уређаје при почетним ажурирањима и преузимањима. Да бисте избегли евентуалне трошкове за пренос података, повежите се са Wi‑Fi-јем."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ако прескочите Wi-Fi:\n\nТаблет неће имати интернет везу.\n\nНећете добити ажурирања софтвера док се не повежете на интернет.\n\nТренутно не можете да активирате функције заштите уређаја."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ако прескочите Wi-Fi:\n\nУређај неће имати интернет везу.\n\nНећете добити ажурирања софтвера док се не повежете на интернет.\n\nТренутно не можете да активирате функције заштите уређаја."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ако прескочите Wi-Fi:\n\nТелефон неће имати интернет везу.\n\nНећете добити ажурирања софтвера док се не повежете на интернет.\n\nТренутно не можете да активирате функције заштите уређаја."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Таблет није могао да се повеже са овом Wi-Fi мрежом."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Уређај није могао да се повеже са овом Wi-Fi мрежом."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефон није могао да се повеже са овом Wi-Fi мрежом."</string>
@@ -1016,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Овим бришете све податке из "<b>"интерне меморије"</b>" телефона, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Тренутно сте пријављени на следеће налоге:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На овом уређају су присутни и други корисници.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фотографије"</li>\n<li>"Други кориснички подаци"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, треба да избришете "<b>"USB меморију"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, треба да избришете садржај "<b>"SD картице"</b>"."</string>
@@ -1091,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Убаците SIM картицу и рестартујте"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Повежите се са интернетом"</string>
     <string name="location_title" msgid="1029961368397484576">"Мојa локацијa"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Пословни профил"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Локација за пословни профил"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Искључила ваша компанија"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Велика прецизност"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Уштеда батерије"</string>
@@ -1444,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екран неће бити у режиму спавања током пуњења"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Омогући snoop евиденцију за Bluetooth HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сними све Bluetooth HCI пакете у датотеци"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Откључавање OEM-a"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Дозволи откључавање функције за покретање"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Унесите PIN"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Унесите PIN уређаја да бисте омогућили откључавање од стране произвођача оригиналне опреме (OEM)"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Желите ли да дозволите откључавање произвођача оригиналне опреме (OEM)?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"УПОЗОРЕЊЕ: Функције за заштиту уређаја неће функционисати на овом уређају док је ово подешавање укључено."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертификација бежичног екрана"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Омогући детаљнију евиденцију за Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Агресиван прелаз са Wi‑Fi мреже на мобилну"</string>
@@ -1860,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Уврштавање података апликација"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Аутоматско враћање"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Када поново инсталирате апликацију, вратите резервне копије подешавања и података"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Услуга прављења резервне копије није активна."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Ово одређују смернице за уређај."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Рез. копија лоз. рачунара"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Резервне копије читавог система тренутно нису заштићене"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Додирните да бисте променили или уклонили лозинку за прављење резервних копија читавог система на рачунару"</string>
@@ -2015,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Увек користи GPU за компоновање екрана"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Симулирај простор боје"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Омогући OpenGL трагове"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Користи AwesomePlayer (застарело)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Користи AwesomePlayer уместо NuPlayer-а за пуштање већине медија"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Онемогући USB преусм. звука"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Онемогући аутомат. преусмер. на USB аудио периферне уређаје"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Прикажи границе распореда"</string>
@@ -2329,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Унесите име SIM картице"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Отвор за SIM картицу %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Мобилни оператер"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Број"</string>
@@ -2340,7 +2327,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"Друга подешавања позива"</string>
@@ -2506,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Задржи водоравни приказ"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Задржи актуелни положај"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Информације за IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Релативне информације за IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифровање"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Настави"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Можете додатно да заштитите овај уређај тако што ћете га подесити да тражи PIN пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме. \n\nНа тај начин штитите податке на изгубљеним или украденим уређајима."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ce86a83..02f685e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vill du koppla från?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Detta avslutar din anslutning till:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Du saknar behörighet att ändra Bluetooth-inställningarna."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Enheter i närheten kan se <xliff:g id="DEVICE_NAME">%1$s</xliff:g> när Bluetooth är på."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Enheter i närheten kan se <xliff:g id="DEVICE_NAME">%1$s</xliff:g> när Bluetooth är på."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vill du koppla från <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Bluetooth-sändning"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vill du inaktivera profilen?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Hantera Wi-Fi, Bluetooth, flygplansläge, mobilnät och VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobildata"</string>
     <string name="calls_title" msgid="3544471959217176768">"Samtal"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Sms"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Sms"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Tillåt dataanvändning via mobilnätet"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Tillåt dataanv. vid roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medelhög till hög säkerhet"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Lösenord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Hög säkerhet"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Enhetsskyddsfunktioner slutar att fungera."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inaktiverad p.g.a. admin., kryptering eller uppgiftslagring"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Inget"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Dra"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ta bort grafiskt lösenord"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ta bort PIN-kod för upplåsning"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Ta bort lösenord för upplåsning"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Ta bort skärmlåset"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Byt grafiskt lösenord"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ändra PIN-kod för upplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ändra lösenord för upplåsning"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"För musik och media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kom ihåg inställningarna"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Ansluten via Wi-Fi-assistent"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Casta skärmen"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktivera Wi-Fi-skärmdelning"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Inga enheter fanns i närheten."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi-inställningar"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ställ in och hantera trådlösa åtkomstpunkter"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Välj Wi‑Fi-nätverk"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Välj Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi aktiveras …"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi inaktiveras …"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"VARNING: Om du inaktiverar Wi‑Fi använder surfplattan bara mobildata för hämtningar och uppdateringar. Anslut till Wi-Fi-nätverket om du vill undvika eventuella dataavgifter."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"VARNING: Om du inaktiverar Wi‑Fi använder enheten bara mobildata för hämtningar och uppdateringar. Anslut till Wi-Fi-nätverket om du vill undvika eventuella dataavgifter."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"VARNING: Om du inaktiverar Wi‑Fi använder mobilen bara mobildata för hämtningar och uppdateringar. Anslut till Wi-Fi-nätverket om du vill undvika eventuella dataavgifter."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Om du inte använder Wi‑Fi:\n\nSurfplattan kommer inte att ha någon internetanslutning.\n\nDu får inte programvaruuppdateringar förrän du ansluter till internet.\n\nFunktioner för enhetsskydd kan inte aktiveras."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Om du inte använder Wi‑Fi:\n\nEnheten kommer inte att ha någon internetanslutning.\n\nDu får inga programvaruuppdateringar förrän du är ansluten till internet.\n\nFunktioner för enhetsskydd kan inte aktiveras."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Om du inte använder Wi‑Fi:\n\nMobilen kommer inte att ha någon internetanslutning.\n\nDu får inte programvaruuppdateringar förrän du ansluter till internet.\n\nFunktioner för enhetsskydd kan inte aktiveras."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Det gick inte att ansluta surfplattan till Wi-Fi-nätverket."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Det gick inte att ansluta enheten till Wi-Fi-nätverket."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Det gick inte att ansluta mobilen till Wi-Fi-nätverket."</string>
@@ -1087,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"För in SIM-kortet och starta om"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Anslut till internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Min plats"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Jobbprofil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Plats för jobbprofil"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Har inaktiverats av företaget"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Läge"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hög precision"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparläge"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inkludera appdata"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk återställning"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"När du installerar om en app återställs säkerhetskopierade inställningar och data"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Säkerhetskopieringstjänsten är inaktiv."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Detta anges i enhetspolicyn."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Lösenord för säkerhetskopia av datorn"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"De fullständiga säkerhetskopiorna av datorn är för närvarande inte skyddade"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tryck om du vill ändra eller ta bort lösenordet för fullständig säkerhetskopiering av datorn"</string>
@@ -2319,8 +2313,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-kort <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM-kortet är tomt"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Namn på SIM-kort"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Ange SIM-namn"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-kortsplats %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operatör"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nummer"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lila"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Inga SIM-kort har anslutits"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status för SIM-kort"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Information om SIM-kort"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Ring upp från standard-SIM-kort"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM-kort för utgående samtal"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Övriga samtalsinställningar"</string>
@@ -2478,7 +2470,7 @@
     <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nästa dag eller vid tidigare alarm"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appaviseringar"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Aviseringsinställningar"</string>
-    <string name="device_feedback" msgid="3238056036766293294">"Skicka feedback om den här enhet"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"Skicka feedback om den här enheten"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ange administratörspinkod"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"På"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Av"</string>
@@ -2496,7 +2488,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Information om IMEI-kod"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Relativ information om IMEI-kod"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Kryptering"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsätt"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Du kan skydda enheten ytterligare genom att kräva att pinkoden ska anges innan den startar. Det går inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm, innan enheten har startats. \n\nDetta skyddar data i enheter som har kommit bort eller stulits."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 4485fe5..58dbfe3 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Tenganisha?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hii ikakata muunganisho wako na:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Huna ruhusa ya kubadilisha mipangilio ya Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> inaonekana kwenye vifaa vya karibu wakati Mipangilio ya Bluetooth ipo wazi."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ungependa kuondoa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Inasambaza"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wasifu ulemazwe?"</string>
@@ -292,7 +293,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Simamia Wi-Fi, Bluetooth, hali ya ndegeni, mitandao ya simu za mkononi na VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Data ya simu za mkononi"</string>
     <string name="calls_title" msgid="3544471959217176768">"Simu zilizopigwa"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Ujumbe wa SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Ruhusu matumizi ya data kwenye mtandao wa simu"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Ruhusu data kwenye mitandao mingine"</string>
     <string name="roaming" msgid="3596055926335478572">"Data nje ya mtandao wa kawaida"</string>
@@ -401,6 +403,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Wastani hadi usalama wa juu"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Nenosiri"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Usalama wa juu"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Imelemazwa na msimamizi, sera ya usimbaji fiche, au hifadhi ya stakabadhi"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Hamna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Telezesha kidole"</string>
@@ -412,6 +416,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ondoa umbo la kufungua"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ondoa PIN ufunguaji"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Ondoa nenosiri la kufungua"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Badilisha umbo la kufungua"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Badilisha PIN ya kufungua"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Badilisha nenosiri la kufungua"</string>
@@ -547,6 +553,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Kwa muziki na midia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kumbuka mipangilio"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Kisaidizi cha Wi-Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Imeunganishwa kupitia Kisaidizi cha Wi-Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Utumaji wa Skrini"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Washa kuonyesha skrini bila kutumia waya"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Hakuna vifaa vilivyopatikana karibu."</string>
@@ -576,8 +583,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Mipangilio ya Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Weka na udhibiti vituo vya kufikia mitandao-hewa"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Chagua mtandao wa Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Chagua Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Inawasha Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Inazima Wi-Fi..."</string>
@@ -592,12 +598,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Angalia Mitandao Inayopatikana"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Ruhusu uchanganuzi wakati wote"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Ruhusu huduma ya Google ya kutambua mahali na programu zingine ziangalie mitandao inayopatikana, hata wakati Wi-Fi imezimwa"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Tumia Wi-Fi huru kiotomatiki"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Ruhusu kisaidizi cha Wi-Fi kiunganishe kiotomatiki kwenye mitandao huru iliyotambuliwa kuwa ya ubora wa juu"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Chagua kisaidizi"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sakinisha vyeti"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Ili kuboresha usahihi wa eneo na kwa ajili ya madhumuni mengine, Google na programu nyingine huchanganua kutafuta mitandao iliyokaribu, hata wakati Wi-Fi imezimwa. Ikiwa hutaki hili litokee, nenda kwenye &gt; Uchanganuzi Mahiri unapatikana wakati wote."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Programu zinaweza kuchanganua kutafuta mitandao iliyokaribu, hata wakati Wi-Fi imezimwa. Ikiwa hutaki hili litokee, nenda kwenye &gt; Uchanganuzi Mahiri unapatikana wakati wote."</string>
@@ -691,12 +694,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ONYO: Kama utaruka hatua ya kuunganisha Wi-Fi, kompyuta kibao itatumia intaneti ya mitandao ya simu pekee kupakua programu na masasisho ya kwanza. Ili uepuke uwezekano wa kutozwa kwa matumizi ya data, unganisha Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ONYO: Kama utaruka hatua ya kuunganisha Wi-Fi, kifaa chako kitatumia intaneti ya mitandao ya simu pekee kupakua programu na masasisho ya kwanza. Ili uepuke uwezekano wa kutozwa kwa matumizi ya data, unganisha Wi-Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ONYO: Kama utaruka hatua ya kuunganisha Wi-Fi, kifaa chako kitatumia intaneti ya mitandao ya simu pekee kupakua programu na masasisho ya kwanza. Ili uepuke uwezekano wa kutozwa kwa matumizi ya data, unganisha Wi-Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Ukiruka Wi-Fi:\n\nKompyuta yako kibao haitakuwa na muuganisho wa Intaneti.\n\nHutapata masasisho ya programu hadi utakapounganisha kwenye Intaneti.\n\nHuwezi kuanza kutumia vipengele vya ulinzi wa kifaa kwa wakati huu."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Ukiruka Wi-Fi:\n\nKifaa chako hakitakuwa na muuganisho wa Intaneti.\n\nHutapata masasisho ya programu hadi utakapounganisha kwenye Intaneti.\n\nHuwezi kuanza kutumia vipengele vya ulinzi wa kifaa kwa wakati huu."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Ukiruka Wi-Fi:\n\nSimu yako haitakuwa na muuganisho wa Intaneti.\n\nHutapata masasisho ya programu hadi utakapounganisha kwenye Intaneti.\n\nHuwezi kuanza kutumia vipengele vya ulinzi wa kifaa kwa wakati huu."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Kompyuta kibao haikuweza kuunganishwa kwenye mtandao huu wa Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Kifaa hakikuweza kuunganisha kwenye mtandao huu wa Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Simu haikuweza kuunganishwa kwenye mtandao huu wa Wi-Fi."</string>
@@ -828,8 +828,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Inua ili uondoe kifaa katika hali tuli"</string>
     <string name="doze_title" msgid="2259176504273878294">"Onyesho la vipengele vyote"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Ondoa skrini katika hali tuli unapopokea simu kwenye kifaa au kupokea arifa"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa maandishi"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukubwa wa fonti"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Mipangilio ya kuzima SIM"</string>
@@ -1009,8 +1008,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya kompyuta kibao"</b>", pamoja na:\n \n "<li>" Akaunti yako ya Google"</li>" \n "<li>"Data na mipangilio ya mfumo na programu"</li>" \n "<li>"Programu zilizopakuliwa"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya simu"</b>", pamoja na:\n \n "<li>"Akaunti yako ya Google"</li>" \n "<li>"Data na mipangilio ya mfumo na programu"</li>" \n "<li>"programu zilizopakuliwa"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zifuatazo:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Kuna watumiaji wengine waliopo kwenye kifaa hiki.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziki"</li>\n<li>"Picha"</li>\n<li>"data nyingine ya mtumiaji"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>" hifadhi ya "</b>" inahitaji kufutwa."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ili kufuta muziki, picha, na data zingine za mtumiaji, "<b>"kadi ya"</b>" inahitaji kufutwa."</string>
@@ -1086,12 +1084,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Tafadhali weka SIM kadi kisha uzime na uwashe"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Tafadhali unganisha kwenye Intaneti"</string>
     <string name="location_title" msgid="1029961368397484576">"Mahali pangu"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Wasifu wa kazini"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Eneo la wasifu wa kazini"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Imezimwa na kampuni yako"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Hali"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Usahihi wa hali ya juu"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Inayookoa betri"</string>
@@ -1851,10 +1846,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Jumuisha data ya programu"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Onyesha upya otomatiki"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Wakati wa kusanidi upya programu, rejesha mipangilio na data ambazo zina nakala rudufu"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Huduma ya kuhifadhi nakala rudufu haifanyi kazi."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Hii huweka na sera ya kifaa yako."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Nenosiri la hifadhi rudufu ya eneo kazi"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Hifadhi rudufu kamili za eneo kazi hazijalindwa kwa sasa"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Gusa ili ubadilishe au uondoe nenosiri la hifadhi rudufu kamili za eneo kazi"</string>
@@ -2318,8 +2311,7 @@
     <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 kadi isiyo na kitu"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Jina la SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Weka jina la SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Nafasi ya SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Mtoa huduma"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nambari"</string>
@@ -2329,7 +2321,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Zambarau"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Hakuna SIM kadi zilizoingizwa"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Hali ya SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Maelezo yanayohusiana na SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Piga simu kwa kutumia SIM kadi chaguo-msingi"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM ya kutumia kupiga simu"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Mipangilio mingine ya simu"</string>
@@ -2472,12 +2463,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Usiku wa siku za wiki"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Wakati wa Kuanza"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Wakati wa kuisha"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> siku inayofuata"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> au kengele yoyote kabla"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> siku inayofuata au kengele yoyote kabla"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Arifa za programu"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mipangilio ya arifa"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Tuma maoni kuhusu kifaa hiki"</string>
@@ -2498,7 +2486,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Maelezo ya IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Maelezo ya IMEI yanayohusiana"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Usimbaji kwa njia fiche"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Endelea"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Unaweza kulinda kifaa hiki zaidi kwa kuweka PIN yako kabla hujakiwasha. Hadi uwashe kifaa, hakiwezi kupokea simu, ujumbe, au arifa, pamoja na kengele. \n\nHii husaidia kulinda data kwenye vifaa vinavyopotea au kuibiwa."</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 77f1431..628c01e 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"துண்டிக்கவா?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"இது, பின்வருவதுடனான உங்கள் இணைப்பைத் துண்டிக்கும்:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"புளுடூத் அமைப்புகளை மாற்ற உங்களுக்கு அனுமதியில்லை."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"புளுடூத் அமைப்புகள் இயக்கத்திலிருக்கும் போது, அருகிலுள்ள சாதனங்களுக்கு <xliff:g id="DEVICE_NAME">%1$s</xliff:g> தெரியும்."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ஐ துண்டிக்கவா?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"அலைபரப்புதல்"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"சுயவிவரத்தை முடக்கவா?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"வைஃபை, புளுடூத், விமானப் பயன்முறை, செல்லுலார் நெட்வொர்க்குகள் &amp; VPNகளை நிர்வகிக்கவும்"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"செல்லுலார் தரவு"</string>
     <string name="calls_title" msgid="3544471959217176768">"அழைப்புகள்"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS செய்திகள்"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"செல்லுலார் நெட்வொர்க் வழியாக தரவுப் பயன்பாட்டை அனுமதி"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"ரோமிங்கின் போது தரவுப் பயன்பாட்டை அனுமதி"</string>
     <string name="roaming" msgid="3596055926335478572">"தரவு ரோமிங்"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"நிர்வாகியால் முடக்கப்படும், முறைமையாக்கக் கொள்கை அல்லது நற்சான்றுக்கான சேமிப்பிடம்"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ஏதுமில்லை"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ஸ்வைப் செய்"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"திறப்பதற்கான வடிவத்தை அகற்று"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"திறக்கும் பின்னை அகற்று"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"திறக்கும் கடவுச்சொல்லை அகற்று"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"திறப்பதற்கான வடிவத்தை மாற்று"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"திறக்கும் பின்னை மாற்று"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"திறப்பதற்கான கடவுச்சொல்லை மாற்று"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"இசை மற்றும் மீடியாவிற்காக"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"அமைப்புகளை நினைவில்கொள்"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"வைஃபை அசிஸ்டண்ட்"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"வைஃபை அசிஸ்டண்ட் மூலம் இணைக்கப்பட்டது"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"திரையை அனுப்பு"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"வயர்லெஸ் காட்சியை இயக்கு"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"அருகில் சாதனங்கள் எதுவுமில்லை."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"வைஃபை அமைப்பு"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"வைஃபை"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"வயர்லெஸ் ஆக்சஸ் பாயிண்ட்களை அமைத்து &amp; நிர்வகிக்கவும்"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"வைஃபை நெட்வொர்க்கைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"வைஃபையைத் தேர்ந்தெடு"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"வைஃபையை இயக்குகிறது…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"வைஃபையை முடக்குகிறது…"</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"எச்சரிக்கை: வைஃபை அமைப்பதைத் தவிர்த்தால், தொடக்க இறக்கங்கள் மற்றும் புதுப்பிப்புகளுக்காக உங்கள் டேப்லெட் செல்லுலார் தரவை மட்டுமே பயன்படுத்தும். ஏற்படக்கூடிய தரவுக் கட்டணங்களைத் தவிர்க்க, வைஃபையுடன் இணைக்கவும்."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"எச்சரிக்கை: வைஃபை அமைப்பதைத் தவிர்த்தால், தொடக்க இறக்கங்கள் மற்றும் புதுப்பிப்புகளுக்காக உங்கள் சாதனம் செல்லுலார் தரவை மட்டுமே பயன்படுத்தும். ஏற்படக்கூடிய தரவுக் கட்டணங்களைத் தவிர்க்க, வைஃபையுடன் இணைக்கவும்."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"எச்சரிக்கை: வைஃபை அமைப்பதைத் தவிர்த்தால், தொடக்க இறக்கங்கள் மற்றும் புதுப்பிப்புகளுக்காக உங்கள் மொபைல் செல்லுலார் தரவை மட்டுமே பயன்படுத்தும். ஏற்படக்கூடிய தரவுக் கட்டணங்களைத் தவிர்க்க, வைஃபையுடன் இணைக்கவும்."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"வைஃபையைப் பயன்படுத்தவில்லை எனில்:\n\nடேப்லெட்டில் இணைய இணைப்பு இருக்காது.\n\nஇணையத்துடன் இணைக்கப்படும் வரை மென்பொருள் புதுப்பிப்புகளைப் பெற மாட்டீர்கள்.\n\nசாதனப் பாதுகாப்பு அம்சங்களை இப்போது இயக்க முடியாது."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"வைஃபையைப் பயன்படுத்தவில்லை எனில்:\n\nசாதனத்தில் இணைய இணைப்பு இருக்காது.\n\nஇணையத்துடன் இணைக்கப்படும் வரை மென்பொருள் புதுப்பிப்புகளைப் பெற மாட்டீர்கள்.\n\nசாதனப் பாதுகாப்பு அம்சங்களை இப்போது இயக்க முடியாது."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"வைஃபையைப் பயன்படுத்தவில்லை எனில்:\n\nமொபைலில் இணைய இணைப்பு இருக்காது.\n\nஇணையத்துடன் இணைக்கப்படும் வரை மென்பொருள் புதுப்பிப்புகளைப் பெற மாட்டீர்கள்.\n\nசாதனப் பாதுகாப்பு அம்சங்களை இப்போது இயக்க முடியாது."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"வைஃபை நெட்வொர்க்குடன் டேப்லெட்டை இணைக்க முடியவில்லை."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"வைஃபை நெட்வொர்க்குடன் சாதனத்தை இணைக்க முடியவில்லை."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"வைஃபை நெட்வொர்க்குடன் தொலைபேசியை இணைக்க முடியவில்லை."</string>
@@ -1087,12 +1090,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"பணி சுயவிவரம்"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"பணி சுயவிவரத்திற்கான இருப்பிடம்"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"உங்கள் நிறுவனம் முடக்கியுள்ளது"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"பயன்முறை"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"அதிக துல்லியத்தன்மை"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"பேட்டரி சேமிப்பு"</string>
@@ -1440,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"சார்ஜ் ஏறும்போது திரை எப்போதும் உறக்கநிலைக்குச் செல்லாது"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"புளூடூத் HCI ஸ்னுப் பதிவை இயக்கு"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"கோப்பில் உள்ள எல்லா புளூடூத் HCI தொகுதிகளையும் படமெடு"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM திறத்தல்"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"பூட்லோடரைத் திறக்க அனுமதி"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"பின்னை உள்ளிடவும்"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM திறப்பை இயக்க, சாதனத்தின் பின்னை உள்ளிடவும்"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM திறத்தலை அனுமதிக்கவா?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"எச்சரிக்கை: இந்த அமைப்பு இயக்கப்பட்டிருக்கும்போது, சாதன பாதுகாப்பு அம்சங்கள் இந்தச் சாதனத்தில் இயங்காது."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"வயர்லெஸ் காட்சிக்கான சான்றிதழ்"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"வைஃபை அதிவிவர நுழைவை இயக்கு"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ஒத்துழைக்காத வைஃபையிலிருந்து செல்லுலாருக்கு மாறு"</string>
@@ -1856,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"பயன்பாட்டுத் தரவு உட்பட"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"தானியங்கு மீட்டெடுப்பு"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"பயன்பாட்டை மீண்டும் நிறுவும்போது, காப்புப் பிரதி எடுத்த அமைப்புகளையும் தரவையும் மீட்டெடு"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"காப்புப்பிரதி சேவை செயல்படவில்லை."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"இது உங்கள் சாதனக் கொள்கையால் அமைக்கப்பட்டுள்ளது."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"டெஸ்க்டாப் மாற்று கடவுச்சொல்"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"டெஸ்க்டாப்பின் மொத்த காப்புப் பிரதிகளும் தற்போது பாதுகாக்கப்படவில்லை"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"டெஸ்க்டாப்பின் முழுமையான காப்புப்பிரதிகளுக்கான கடவுச்சொல்லை மாற்றுவதற்கு அல்லது அகற்றுவதற்குத் தொடவும்"</string>
@@ -2011,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"திரைத் தொகுத்தலுக்கு எப்போதும் GPU ஐப் பயன்படுத்து"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"வண்ணத்தின் இடைவெளியை உருவகப்படுத்து"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL தடயங்களை இயக்கு"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayerஐப் பயன்படுத்து (தடுக்கப்பட்டது)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"மீடியா பிளேபேக்கிற்கு NuPlayerக்கு பதிலாக AwesomePlayerஐ பயன்படுத்து"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ஆடியோ ரூட்டிங்கை முடக்கு"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ஆடியோ உபகரணத்திற்கு தன்னியக்க ரூட்டிங்கை முடக்கு"</string>
     <string name="debug_layout" msgid="5981361776594526155">"தளவமைப்பு எல்லைகளைக் காட்டு"</string>
@@ -2325,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"சிம் பெயரை உள்ளிடுக"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM ஸ்லாட் %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"சேவை வழங்குநர்"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"எண்"</string>
@@ -2336,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"ஊதா"</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>
@@ -2502,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"அகலவாக்கில் வை"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"தற்போதைய திசையமைப்பில் வை"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI தகவல்"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI தொடர்புடைய தகவல்"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"குறியாக்கம்"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"தொடர்"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"இந்தச் சாதனத்தைத் துவக்க, பின் தேவைப்படுமாறு அமைத்து, இதை மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும்வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇவ்வாறு செய்வதால், காணாமல் போன அல்லது களவு போன சாதனங்களில் தரவைப் பாதுகாக்கலாம்."</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 17e4207..25c2c43 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"డిస్‌కనెక్ట్ చేయాలా?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ఇందువలన దీనితో మీరు ఏర్పాటు చేసుకున్న కనెక్షన్ ముగుస్తుంది:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"మీకు బ్లూటూత్ సెట్టింగ్‌లను మార్చడానికి అనుమతి లేదు."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"బ్లూటూత్ సెట్టింగ్‌లు తెరవబడి ఉన్నప్పుడు సమీపంలోని పరికరాలకు <xliff:g id="DEVICE_NAME">%1$s</xliff:g> కనిపిస్తుంది."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"బ్లూటూత్ సెట్టింగ్‌లను తెరిచి ఉన్నప్పుడు <xliff:g id="DEVICE_NAME">%1$s</xliff:g> సమీప పరికరాలకు కనిపిస్తుంది."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ను డిస్‌కనెక్ట్ చేయాలా?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ప్రసారం"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ప్రొఫైల్‌ను నిలిపివేయాలా?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, బ్లూటూత్, విమాన మోడ్, సెల్యులార్ నెట్‌వర్క్‌లు, &amp; VPNలను నిర్వహించండి"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"సెల్యులార్ డేటా"</string>
     <string name="calls_title" msgid="3544471959217176768">"కాల్‌లు"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS సందేశాలు"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS సందేశాలు"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"సెల్యు. నెట్‌వ. ద్వారా డేటా విని. అనుమతి"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"రోమింగ్‌లో డేటా వినియో. అనుమతి"</string>
     <string name="roaming" msgid="3596055926335478572">"డేటా రోమింగ్"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"మధ్యస్థం నుండి అధిక భద్రత"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"పాస్‌వర్డ్"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"అధిక భద్రత"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"పరికర రక్షణ లక్షణాలు ఇకపై పని చేయవు."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"నిర్వాహకులు, గుప్తీకరణ విధానం లేదా ఆధారాల నిల్వ ద్వారా నిలిపివేయబడింది"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ఏదీ వద్దు"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"స్వైప్ చేయండి"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"అన్‌లాక్ నమూనాను తీసివేయండి"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"అన్‌లాక్ పిన్‌ను తీసివేయండి"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"అన్‌లాక్ పాస్‌వర్డ్‌ను తీసివేయండి"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"స్క్రీన్ లాక్‌ను తీసివేయండి"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"అన్‌లాక్ నమూనాను మార్చు"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"అన్‌లాక్ పిన్‌ను మార్చండి"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"అన్‌లాక్ పాస్‌వర్డ్‌ను మార్చు"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"సంగీతం మరియు మీడియా కోసం"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"సెట్టింగ్‌లను గుర్తుంచుకో"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi సహాయకం"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi సహాయకం ద్వారా కనెక్ట్ చేయబడింది"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"ప్రసారం స్క్రీన్"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"వైర్‌లెస్ ప్రదర్శనను ప్రారంభించు"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"సమీపంలోని పరికరాలు కనుగొనబడలేదు."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi సెట్టింగ్‌లు"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"వైర్‌లెస్ ప్రాప్యత స్థానాలను సెటప్ చేయండి &amp; నిర్వహించండి"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi‑Fi నెట్‌వర్క్‌ను ఎంచుకోండి"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fiను ఎంచుకోండి"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fiను ప్రారంభిస్తోంది…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fiని ఆపివేస్తోంది…"</string>
@@ -696,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"హెచ్చరిక: మీరు Wi‑Fiని దాటవేస్తే, మీ టాబ్లెట్ ప్రాథమిక డౌన్‌లోడ్‌లు మరియు నవీకరణల కోసం సెల్యులార్ డేటాని మాత్రమే ఉపయోగిస్తుంది. సంభావ్య డేటా ఛార్జీలను నివారించడానికి, Wi‑Fiకి కనెక్ట్ చేయండి."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"హెచ్చరిక: మీరు Wi‑Fiని దాటవేస్తే, మీ పరికరం ప్రాథమిక డౌన్‌లోడ్‌లు మరియు నవీకరణల కోసం సెల్యులార్ డేటాని మాత్రమే ఉపయోగిస్తుంది. సంభావ్య డేటా ఛార్జీలను నివారించడానికి, Wi‑Fiకి కనెక్ట్ చేయండి."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"హెచ్చరిక: మీరు Wi‑Fiని దాటవేస్తే, మీ ఫోన్ ప్రాథమిక డౌన్‌లోడ్‌లు మరియు నవీకరణల కోసం సెల్యులార్ డేటాని మాత్రమే ఉపయోగిస్తుంది. సంభావ్య డేటా ఛార్జీలను నివారించడానికి, Wi‑Fiకి కనెక్ట్ చేయండి."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"మీరు Wi‑Fiని దాటవేస్తే:\n\nమీ టాబ్లెట్‌కు ఇంటర్నెట్ కనెక్షన్ ఉండదు.\n\nమీరు ఇంటర్నెట్‌కు కనెక్ట్ చేసే వరకు సాఫ్ట్‌వేర్ నవీకరణలను పొందరు.\n\nమీరు ఈ సమయంలో పరికర రక్షణ లక్షణాలను సక్రియం చేయలేరు."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"మీరు Wi‑Fiని దాటవేస్తే:\n\nమీ పరికరానికి ఇంటర్నెట్ కనెక్షన్ ఉండదు.\n\nమీరు ఇంటర్నెట్‌కు కనెక్ట్ చేసే వరకు సాఫ్ట్‌వేర్ నవీకరణలను పొందరు.\n\nమీరు ఈ సమయంలో పరికర రక్షణ లక్షణాలను సక్రియం చేయలేరు."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"మీరు Wi‑Fiని దాటవేస్తే:\n\nమీ ఫోన్‌కి ఇంటర్నెట్ కనెక్షన్ ఉండదు.\n\nమీరు ఇంటర్నెట్‌కు కనెక్ట్ చేసే వరకు సాఫ్ట్‌వేర్ నవీకరణలను పొందరు.\n\nమీరు ఈ సమయంలో పరికర రక్షణ లక్షణాలను సక్రియం చేయలేరు."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"టాబ్లెట్‌ను ఈ Wi‑Fi నెట్‌వర్క్‌కు కనెక్ట్ చేయడం సాధ్యపడలేదు."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"పరికరాన్ని ఈ Wi‑Fi నెట్‌వర్క్‌కి కనెక్ట్ చేయడం సాధ్యపడలేదు."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ఫోన్‌ను ఈ Wi‑Fi నెట్‌వర్క్‌కు కనెక్ట్ చేయడం సాధ్యపడలేదు."</string>
@@ -1087,12 +1086,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"కార్యాలయ ప్రొఫైల్‌"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"కార్యాలయ ప్రొఫైల్ యొక్క స్థానం"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"మీ కంపెనీ ద్వారా ఆఫ్ చేయబడింది"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"మోడ్"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"అధిక నిర్దుష్టత"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"బ్యాటరీ ఆదా"</string>
@@ -1852,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"అనువర్తన డేటాను చేర్చు"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"స్వీయ పునరుద్ధరణ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"అనువర్తనాన్ని మళ్లీ ఇన్‌స్టాల్ చేస్తున్నప్పుడు, బ్యాకప్ చేయబడిన సెట్టింగ్‌లను మరియు డేటాను పునరుద్ధరించండి"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"బ్యాకప్ సేవ నిష్క్రియంగా ఉంది."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ఇది మీ పరికరం విధానం ద్వారా సెట్ చేయబడింది."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"డెస్క్‌టాప్ బ్యాకప్ పాస్‌వర్డ్"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"డెస్క్‌టాప్ పూర్తి బ్యాకప్‌లు ప్రస్తుతం రక్షించబడలేదు"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"డెస్క్‌టాప్ పూర్తి బ్యాకప్‌ల కోసం పాస్‌వర్డ్‌ను మార్చడానికి లేదా తీసివేయడానికి తాకండి"</string>
@@ -2319,8 +2313,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM పేరు నమోదు చేయండి"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM స్లాట్ %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"క్యారియర్"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"నంబర్"</string>
@@ -2330,7 +2323,6 @@
     <string name="color_purple" msgid="3888532466427762504">"వంగ రంగు"</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>
@@ -2496,7 +2488,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ల్యాండ్‌స్కేప్ వీక్షణలో ఉంచు"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ప్రస్తుత దృగ్విన్యాసంలో ఉంచు"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI సమాచారం"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI సంబంధిత సమాచారం"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"గుప్తీకరణ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"కొనసాగించండి"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందు మీ PIN అవసరమయ్యే విధంగా చేయడం ద్వారా దీనికి మరింత రక్షణను అందించవచ్చు. పరికరం ప్రారంభించబడే వరకు, ఇది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించలేదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాల్లోని డేటాను సంరక్షించడంలో ఇది సహాయకరంగా ఉంటుంది."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index aaa9ff7..de4cf4c 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ตัดการเชื่อมต่อหรือไม่"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"การดำเนินการนี้จะจบการเชื่อมต่อของคุณกับ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"คุณไม่มีสิทธิ์ในการเปลี่ยนการตั้งค่าบลูทูธ"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ปรากฏในอุปกรณ์ใกล้เคียงเมื่อเปิดการตั้งค่าบลูทูธ"</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ยกเลิกการเชื่อมต่อ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ใช่ไหม"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"การแพร่สัญญาณ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ปิดใช้งานโปรไฟล์หรือไม่"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"จัดการ Wi-Fi, บลูทูธ, โหมดบนเครื่องบิน, เครือข่ายมือถือ และ VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"ข้อมูลมือถือ"</string>
     <string name="calls_title" msgid="3544471959217176768">"การโทร"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"ข้อความ SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"อนุญาตให้ใช้ข้อมูลผ่านเครือข่ายมือถือ"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"อนุญาตให้ใช้ข้อมูลเมื่อโรมมิ่ง"</string>
     <string name="roaming" msgid="3596055926335478572">"การโรมมิ่งอินเทอร์เน็ต"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"ปิดใช้งานโดยผู้ดูแลระบบ นโยบายการเข้ารหัส หรือที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ไม่มี"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"กวาดนิ้ว"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"นำรหัสผ่านเพื่อปลดล็อกออก"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"เปลี่ยนรหัสผ่านสำหรับปลดล็อก"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"สำหรับเพลงและสื่อ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"จำการตั้งค่า"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"เชื่อมต่อผ่านตัวช่วย Wi-Fi อยู่"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"ส่งหน้าจอ"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"เปิดใช้การแสดงผลแบบไร้สาย"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ไม่พบอุปกรณ์ในบริเวณใกล้เคียง"</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"การตั้งค่า WiFi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"WiFi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ตั้งค่าและจัดการจุดเข้าใช้งานระบบไร้สาย"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"เลือกเครือข่าย Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"เลือก Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"กำลังเปิด WiFi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"กำลังปิด WiFi…"</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"คำเตือน: หากไม่ใช้ Wi-Fi แท็บเล็ตของคุณจะใช้เฉพาะข้อมูลมือถือสำหรับการดาวน์โหลดและการอัปเดตเริ่มต้น หากต้องการหลีกเลี่ยงการเรียกเก็บค่าบริการข้อมูลที่อาจเกิดขึ้น โปรดเชื่อมต่อ Wi-Fi"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"คำเตือน: หากไม่ใช้ Wi-Fi อุปกรณ์ของคุณจะใช้เฉพาะข้อมูลมือถือสำหรับการดาวน์โหลดและการอัปเดตเริ่มต้น หากต้องการหลีกเลี่ยงการเรียกเก็บค่าบริการข้อมูลที่อาจเกิดขึ้น โปรดเชื่อมต่อ Wi-Fi"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"คำเตือน: หากไม่ใช้ Wi-Fi โทรศัพท์ของคุณจะใช้เฉพาะข้อมูลมือถือสำหรับการดาวน์โหลดและการอัปเดตเริ่มต้น หากต้องการหลีกเลี่ยงการเรียกเก็บค่าบริการข้อมูลที่อาจเกิดขึ้น โปรดเชื่อมต่อ Wi-Fi"</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"หากคุณข้าม Wi‑Fi:\n\nแท็บเล็ตจะไม่มีการเชื่อมต่ออินเทอร์เน็ต\n\nคุณจะไม่ได้รับการอัปเดตซอฟต์แวร์จนกว่าจะเชื่อมต่ออินเทอร์เน็ต\n\nคุณไม่สามารถเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ได้ในขณะนี้"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"หากคุณข้าม Wi‑Fi:\n\nอุปกรณ์จะไม่มีการเชื่อมต่ออินเทอร์เน็ต\n\nคุณจะไม่ได้รับการอัปเดตซอฟต์แวร์จนกว่าจะเชื่อมต่ออินเทอร์เน็ต\n\nคุณไม่สามารถเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ได้ในขณะนี้"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"หากคุณข้าม Wi‑Fi:\n\nโทรศัพท์จะไม่มีการเชื่อมต่ออินเทอร์เน็ต\n\nคุณจะไม่ได้รับการอัปเดตซอฟต์แวร์จนกว่าจะเชื่อมต่ออินเทอร์เน็ต\n\nคุณไม่สามารถเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ได้ในขณะนี้"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"แท็บเล็ตไม่สามารถเชื่อมต่อกับเครือข่าย WiFi นี้"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"อุปกรณ์ไม่สามารถเชื่อมต่อกับเครือข่าย Wi-Fi นี้"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"โทรศัพท์ไม่สามารถเชื่อมต่อกับเครือข่าย WiFi นี้"</string>
@@ -1087,12 +1090,9 @@
     <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>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"โปรไฟล์งาน"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"สถานที่สำหรับโปรไฟล์งาน"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"บริษัทของคุณเป็นผู้ปิด"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"โหมด"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ความแม่นยำสูง"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ประหยัดแบตเตอรี่"</string>
@@ -1440,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"หน้าจอจะไม่เข้าสู่โหมดสลีปขณะชาร์จ"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"เปิดใช้งานบันทึกสอดแนมบลูทูธ HCI"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"บันทึกแพ็คเก็ตบลูทูธ HCI ทั้งหมดในไฟล์"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"การปลดล็อก OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"อนุญาตให้ปลดล็อกตัวโหลดการเปิดเครื่อง"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"ป้อน PIN ของคุณ"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"ป้อน PIN ของอุปกรณ์เพื่อเปิดใช้การปลดล็อก OEM"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"อนุญาตการปลดล็อก OEM ไหม"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"คำเตือน: คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานบนอุปกรณ์นี้ขณะที่การตั้งค่านี้เปิดอยู่"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"การรับรองการแสดงผลแบบไร้สาย"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"เปิดใช้การบันทึกรายละเอียด Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"สลับ Wi‑Fi เป็นมือถือเมื่อสัญญาณอ่อน"</string>
@@ -1856,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"รวมข้อมูลแอป"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"คืนค่าอัตโนมัติ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"เมื่อติดตั้งแอปพลิเคชันใหม่อีกครั้ง ให้คืนค่าการตั้งค่าและข้อมูลที่สำรองไว้"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"บริการสำรองข้อมูลไม่มีการใช้งาน"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"ค่านี้ตั้งโดยนโยบายด้านอุปกรณ์ของคุณ"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"รหัสผ่านการสำรองข้อมูลในเดสก์ท็อป"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"การสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อป ไม่ได้รับการป้องกันในขณะนี้"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"แตะเพื่อเปลี่ยนหรือลบรหัสผ่านสำหรับการสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อป"</string>
@@ -2011,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ใช้ GPU ในการจัดวางองค์ประกอบหน้าจอเสมอ"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"จำลองระบบสี"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"เปิดใช้ร่องรอยใน OpenGL"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"ใช้ Awesome (เลิกใช้แล้ว)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"ใช้ AwesomePlayer แทน NuPlayer ในการเล่นสื่อทั่วไป"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"ปิดการกำหนดเส้นทางเสียงทาง USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"ปิดการกำหนดเส้นทางโดยอัตโนมัติไปยังอุปกรณ์ต่อพ่วงเสียงทาง USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"แสดงขอบของการจัดวาง"</string>
@@ -2325,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"ป้อนชื่อซิม"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"ช่องใส่ซิม %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"ผู้ให้บริการ"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"หมายเลข"</string>
@@ -2336,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"ม่วง"</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>
@@ -2502,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ใช้มุมมองแนวนอน"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ใช้การวางแนวเดิม"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"ข้อมูล IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"ข้อมูลที่เกี่ยวข้องกับ IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"การเข้ารหัส"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ต่อไป"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"นอกจากนี้คุณยังสามารถปกป้องอุปกรณ์เครื่องนี้เพิ่มเติมโดยกำหนดให้ต้องป้อน PIN ก่อนที่อุปกรณ์จะเริ่มต้นขึ้น อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงเสียงเตือนได้จนกว่าอุปกรณ์จะเริ่มต้นขึ้น \n\nซึ่งจะช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 2bcff51..bb8d777 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Idiskonekta?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tatapusin nito ang iyong koneksyon sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Wala kang pahintulot na palitan ang mga setting ng Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Nakikita ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> habang bukas ang Bluetooth Setting."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"I-disconnect ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Pagbo-broadcast"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Huwag paganahin ang profile?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Pamahalaan ang Wi-Fi, Bluetooth, airplane mode, mga cellular network at VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Cellular data"</string>
     <string name="calls_title" msgid="3544471959217176768">"Mga Tawag"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Mga Mensaheng SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Payagan ang data usage over cellular network"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Payagan data usage pag roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming ng data"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Katamtaman hanggang mataas na seguridad"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Mataas na seguridad"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Hindi pinagana ng administrator, patakaran sa pag-encrypt, o storage ng kredensyal"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Wala"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Mag-swipe"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Alisin ang naka-unlock na pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Alisin ang naka-unlock na PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Alisin ang password na pang-unlock"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Baguhin ang naka-unlock na pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Palitan ang PIN na pang-unlock"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Baguhin ang naka-unlock na password"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para sa musika at media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Tandaan ang mga setting"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Nakakonekta sa pamamagitan ng Wi‑Fi assistant"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"I-cast ang screen"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"I-enable ang wireless display"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Walang nakitang mga kalapit na device."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Mga setting ng Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Mag-set up &amp; mamahala ng mga wireless na access point"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Pumili ng Wi‑Fi network"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Pumili ng Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Ino-on ang Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Ino-off ang Wi-Fi..."</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"BABALA: kung lalaktawan mo ang Wi‑Fi, gagamitin lang ng iyong tablet ang mobile data para sa mga paunang pag-download at pag-update. Upang maiwasan ang mga posibleng karagdagang pagsingil sa data, kumonekta sa Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"BABALA: kung lalaktawan mo ang Wi‑Fi, gagamitin lang ng iyong device ang mobile data para sa mga paunang pag-download at pag-update. Upang maiwasan ang mga posibleng karagdagang pagsingil sa data, kumonekta sa Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"BABALA: kung lalaktawan mo ang Wi‑Fi, gagamitin lang ng iyong telepono ang mobile data para sa mga paunang pag-download at pag-update. Upang maiwasan ang mga posibleng karagdagang pagsingil sa data, kumonekta sa Wi‑Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Kung lalaktawan mo ang Wi‑Fi:\n\nHindi magkakaroon ng koneksyon sa Internet ang iyong tablet.\n\nHindi ka makakatanggap ng mga update sa software hanggang sa kumonekta ka sa Internet.\n\nHindi ka makakapag-activate ng mga feature para sa proteksyon ng device sa ngayon."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Kung lalaktawan mo ang Wi‑Fi:\n\nHindi magkakaroon ng koneksyon sa Internet ang iyong device.\n\nHindi ka makakatanggap ng mga update sa software hanggang sa kumonekta ka sa Internet.\n\nHindi ka makakapag-activate ng mga feature para sa proteksyon ng device sa ngayon."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Kung lalaktawan mo ang Wi‑Fi:\n\nHindi magkakaroon ng koneksyon sa Internet ang iyong telepono.\n\nHindi ka makakatanggap ng mga update sa software hanggang sa kumonekta ka sa Internet.\n\nHindi ka makakapag-activate ng mga feature para sa proteksyon ng device sa ngayon."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Hindi nakakonekta sa Wi-Fi network na ito ang tablet."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Hindi nakakonekta ang device na ito sa Wi‑Fi network na ito."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Hindi nakakonekta sa Wi-Fi network na ito ang telepono."</string>
@@ -1087,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Mangyaring magpasok ng SIM card at mag-restart"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Mangyaring kumonekta sa Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Aking Lokasyon"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Profile sa trabaho"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokayon ng profile sa trabaho"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Na-off ng iyong kumpanya"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Napakatumpak"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Pagtitipid ng baterya"</string>
@@ -1440,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Hindi kailanman hihinto ang screen kapag kinakargahan"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"I-enable ang Bluetooth HCI snoop log"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"I-capture ang lahat ng bluetooth HCI packet sa isang file"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Pag-a-unlock ng OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Payagan na ma-unlock ang bootloader"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Ilagay ang iyong PIN"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ilagay ang PIN ng iyong device upang ma-enable ang pag-unlock na OEM"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Payagan ang pag-a-unlock ng OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"BABALA: Hindi gagana ang mga feature sa pagprotekta sa device sa device na ito habang naka-on ang setting na ito."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification ng wireless display"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"I-enable ang Pagla-log sa Wi‑Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresibong paglipat ng Wi‑Fi sa Cellular"</string>
@@ -1856,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Isama ang data ng app"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Awtomatikong pagbalik"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Kapag muling ini-install ang isang app, ipanumbalik ang mga na-back up na setting at data"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Hindi aktibo ang backup na serbisyo."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Itinatakda ito ng iyong patakaran sa device."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Password ng pag-backup ng desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Kasalukuyang hindi pinoprotektahan ang mga buong pag-backup ng desktop"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Pindutin upang baguhin o alisin ang password para sa mga buong pag-backup ng desktop"</string>
@@ -2011,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Laging gamitin ang GPU para sa screen compositing"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Gayahin ang color space"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Paganahin trace ng OpenGL"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Gamitin ang AwesomePlayer (di na ginagamit)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Gamitin ang AwesomePlayer sa halip na NuPlayer sa karamihan ng media playback"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"I-disable USB audio routing"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"I-disable automatic routing sa USB audio peripheral"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Ipakita mga layout bound"</string>
@@ -2325,8 +2317,7 @@
     <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">"Walang laman ang SIM"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Pangalan ng SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Ilagay ang pangalan ng SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Slot ng SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Carrier"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numero"</string>
@@ -2336,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Lila"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Walang nakalagay na mga SIM card"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Status ng SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Impormasyong kaugnay sa SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Pagtawag mula sa default na SIM"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM para sa mga papalabas na tawag"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Iba pang mga setting ng tawag"</string>
@@ -2502,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Impormasyon ng IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Kaugnay na impormasyon ng IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Pag-encrypt"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Magpatuloy"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Maaari mong higit pang maprotektahan ang device na ito sa pamamagitan ng paghingi ng iyong PIN bago ito magbukas. Hanggang sa magbukas ang device, hindi ito makakatanggap ng mga tawag, mensahe o notification, kasama ang mga alarm. \n\nNakakatulong itong protektahan ang data sa mga nawala o nanakaw na device."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index db5e8ab..3cd9927 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Bağlantı kesilsin mi?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Şu cihazla bağlantınız kesilecek:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Bluetooth ayarlarını değiştirmek için izniniz yok."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth Ayarları açıkken yakındaki cihazlar tarafından görülebilir."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bağlantısı kesilsin mi?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Yayınlama"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil devre dışı bırakılsın mı?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Kablosuz, Bluetooth, uçak modu, hücresel ağlar ve VPN\'leri yönetin"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Hücresel veri"</string>
     <string name="calls_title" msgid="3544471959217176768">"Çağrılar"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS İletileri"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Hücresel ağ üzerinden veri kullanımına izin verin"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Dolaşımda veri kullanımına izin ver"</string>
     <string name="roaming" msgid="3596055926335478572">"Veri dolaşımı"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Orta-yüksek düzey güvenlik"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Şifre"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Yüksek düzey güvenlik"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Devre dışı bırakıldı"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Hiçbiri"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Hızlıca kaydırın"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Kilit açma desenini kaldır"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Kilit açma PIN\'ini kaldır"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Kilit açma şifresini kaldır"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Kilit açma desenini değiştir"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Kilit açma PIN\'ini değiştir"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Kilit açma şifresini değiştir"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Müzik ve medya için"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ayarları anımsa"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Kablosuz bağlantı yardımcısıyla bağlandı"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Yayınlama ekranı"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Kablosuz görüntülemeyi etkinleştir"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Yakınlarda cihaz bulunamadı."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Kablosuz ayarları"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Kablosuz"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Kablosuz erişim noktalarını kur ve yönet"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Kablosuz ağ seçin"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Kablosuz bağlantı seç"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Kablosuz açılıyor…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Kablosuz kapatılıyor…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Tarama her zaman kullanılabilir"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Taramaya her zaman izin ver"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Kablosuz özelliği kapalıyken dahi Google\'ın konum hizmetinin ve diğer uygulamaların ağları taramasına izin verin"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Açık Kablosuz bağlantıyı otomatik kullan"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Bir Kablosuz bağlantı yardımcısı, yüksek kaliteli olduğu belirlenen açık ağlara otomatik bağlansın"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Yardımcı seçin"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifika yükle"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Konum doğruluğunu iyileştirmek için ve diğer amaçlarla, Google ve diğer uygulamalar, Kablosuz kapalı olduğunda dahi yakınlardaki ağları tarayabilir. Bunu istemiyorsanız, Gelişmiş &gt; Tarama her zaman kullanılabilir seçeneğine gidin."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Uygulamalar, Kablosuz bağlantı kapalı olduğunda dahi yakınlardaki ağları tarayabilir. Bunu istemiyorsanız, Gelişmiş &gt; Tarama her zaman kullanılabilir seçeneğine gidin."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"UYARI: Kablosuz bağlantıyı atlarsanız tabletiniz ilk indirme ve güncelleme işlemleri için yalnızca hücresel verileri kullanır. Olası veri ücretlerinden kaçınmak için Kablosuz ağa bağlanın."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"UYARI: Kablosuz bağlantıyı atlarsanız cihazınız ilk indirme ve güncelleme işlemleri için yalnızca hücresel verileri kullanır. Olası veri ücretlerinden kaçınmak için Kablosuz ağa bağlanın."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"UYARI: Kablosuz bağlantıyı atlarsanız telefonunuz ilk indirme ve güncelleme işlemleri için yalnızca hücresel verileri kullanır. Olası veri ücretlerinden kaçınmak için Kablosuz ağa bağlanın."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Kablosuz\'u atlarsanız:\n\nTabletinizin İnternet bağlantısı olmaz.\n\nİnternet\'e bağlanana kadar yazılım güncellemeleri almazsınız.\n\nBu sırada cihaz koruma özelliklerini etkinleştiremezsiniz."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Kablosuz\'u atlarsanız:\n\nCihazınızın İnternet bağlantısı olmaz.\n\nİnternet\'e bağlanana kadar yazılım güncellemeleri almazsınız.\n\nBu sırada cihaz koruma özelliklerini etkinleştiremezsiniz."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Kablosuz\'u atlarsanız:\n\nTelefonunuzun İnternet bağlantısı olmaz.\n\nİnternet\'e bağlanana kadar yazılım güncellemeleri almazsınız.\n\nBu arada cihaz koruma özelliklerini etkinleştiremezsiniz."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet bu Kablosuz ağa bağlanamadı."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Cihaz bu Kablosuz ağa bağlanamadı."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon bu Kablosuz ağa bağlanamadı."</string>
@@ -836,8 +836,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Kaldırarak uyandır"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ortam ekranı"</string>
-    <!-- no translation found for doze_summary (7128970177894383698) -->
-    <skip />
+    <string name="doze_summary" msgid="7128970177894383698">"Cihazı elime aldığımda veya bildirim geldiğinde ekranı uyandır"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Yazı tipi boyutu"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kart kilit ayarları"</string>
@@ -1017,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Bu işlem tablet bilgisayarınızın "<b>"dahili depolama alanından"</b>"şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Bu işlem, telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu cihazda başka kullanıcılar da var.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Müzik"</li>\n<li>"Fotoğraflar"</li>\n<li>"Diğer kullanıcı verileri"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"USB belleğin"</b>" silinmesi gerekir."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"SD kartın"</b>" silinmesi gerekir."</string>
@@ -1092,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Lütfen SIM kartı takın ve yeniden başlatın"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Lütfen İnternet\'e bağlanın"</string>
     <string name="location_title" msgid="1029961368397484576">"Konumum"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"İş profili"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"İş profili konumu"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Firmanız tarafından kapatıldı"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Yüksek doğruluk"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Pil tasarrufu"</string>
@@ -1445,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Şarj edilirken ekran hiçbir zaman uykuya geçmez"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI araştırmayı etkinleştir"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bir dosyadaki tüm Bluetooth HCI paketlerini yakala"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM kilit açma"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Önyükleyicinin kilidinin açılmasına izin ver"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN kodunuzu girin"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM kilit açma özelliğini etkinleştirmek için cihazınızın PIN kodunu girin."</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM kilit açmaya izin verilsin mi?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UYARI: Bu ayar açıkken cihaz koruma özellikleri bu cihazda çalışmayacaktır."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Kablosuz ekran sertifikası"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Kablosuz Ayrıntılı Günlük Kaydını etkinleştir"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Kablosuz\'dan Hücresel Ağa agresif geçiş"</string>
@@ -1861,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Uygulama verilerini dahil et"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Otomatik geri yükle"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Bir uygulama yeniden yüklendiğinde, yedeklenen ayarları ve diğer verileri geri yükle"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Yedekleme hizmeti etkin değil."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Bu, cihaz politikanız tarafından ayarlanır."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Masaüstü yedekleme şifresi"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Masaüstü tam yedeklemeleri şu an korunmuyor"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Masaüstü tam yedeklemelerinin şifresini değiştirmek veya kaldırmak için dokunun"</string>
@@ -2016,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Ekran oluştururken her zaman GPU\'yu kullan"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Renk uzayını simüle et"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL izlerini etkinleştir"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer\'ı kullan (kullanımdan kaldırıldı)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Çoğu medya oynatma işleminde NuPlayer yerine AwesomePlayer\'ı kullan"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ses yönlendirmesini kapat"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ses çevre birimlerine otomatik yönlendirmeyi kapat"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Düzen sınırlarını göster"</string>
@@ -2330,8 +2317,7 @@
     <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 boş"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM kart adı"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM adı girin"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM yuvası %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Operatör"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Numara"</string>
@@ -2341,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Mor"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM kart takılı değil"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM durumu"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM ile ilgili bilgiler"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Varsayılan SIM\'den geri ara"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Giden çağrılar için SIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Diğer çağrı ayarları"</string>
@@ -2484,12 +2469,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Hafta içi her gece"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Başlangıç zamanı"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Bitiş zamanı"</string>
-    <!-- no translation found for zen_mode_end_time_priority_next_day_summary_format (2910982148167785730) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_same_day_summary_format (2002665300812473888) -->
-    <skip />
-    <!-- no translation found for zen_mode_end_time_none_next_day_summary_format (732719357166551378) -->
-    <skip />
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"Ertesi gün <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> veya öncesinde herhangi bir alarm"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"Ertesi gün saat <xliff:g id="FORMATTED_TIME">%s</xliff:g> veya öncesinde herhangi bir alarm"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Uygulama bildirimleri"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirim ayarları"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bu cihazla ilgili geri bildirim gönder"</string>
@@ -2510,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI bilgileri"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI göreli bilgileri"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Şifreleme"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Devam"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Başlatılmadan önce PIN\'inizin girilmesini isteyerek bu cihazı daha ileri düzeyde koruyabilirsiniz. Cihaz başlayana kadar çağrılar, iletiler veya bildirimler alınamaz. \n\nBu tedbir, kaybedilen veya çalınan cihazlardaki verileri korumaya yardımcı olur."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5616563..033ec35 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Від’єднатися?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Це призведе до роз’єднання з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Ви не маєте дозволу змінювати налаштування Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> видимий для пристроїв поблизу, якщо відкрито налашт. Bluetooth."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Пристрої поблизу можуть знайти <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, якщо відкрито налаштування Bluetooth."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Відключити пристрій <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Трансляція"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Вимкнути профіль?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Керуйте Wi-Fi, Bluetooth, режимом польоту, мобільними мережами та мережами VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Мобільні дані"</string>
     <string name="calls_title" msgid="3544471959217176768">"Дзвінки"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS-повідомлення"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS-повідомлення"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Передавати дані через мобільну мережу"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Передавати дані в роумінгу"</string>
     <string name="roaming" msgid="3596055926335478572">"Роумінг даних"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Рівень захисту від середнього до високого"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Високий рівень захисту"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Функції захисту пристрою не працюватимуть."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Вимкнено адміністратором, правилом шифрування або сховищем облікових даних"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Немає"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Провести по екрану"</string>
@@ -410,6 +411,7 @@
     <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_password_summary" msgid="192161194564577025">"Видаліть пароль розблок."</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Вимкнення блокування екрана"</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_password_title" msgid="5606298470358768865">"Змінити пароль розблок."</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музики та медіа"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запам\'ятати налашт."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Під’єднано через Диспетчер Wi-Fi-з’єднання"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Транслювати екран"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Увімкнути бездротовий екран"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Не знайдено пристроїв поблизу."</string>
@@ -584,8 +587,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Налаштування Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Налашт. і керуйте бездрот. точками доступу"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Виберіть мережу Wi-Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Вибрати Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Увімкнення Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Вимкнення Wi‑Fi…"</string>
@@ -600,12 +602,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Сканування завжди доступне"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Завжди дозволяти сканування"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Дозволити службі локації Google та іншим додаткам сканувати мережі, навіть якщо Wi-Fi вимкнено"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Під’єднуватися до відкритих мереж Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Дозволити Wi‑Fi Assistant автоматично під’єднуватися до відкритих мереж із потужним сигналом"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Вибрати помічника"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Установити сертифікати"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей Google та інші програми можуть шукати мережі поблизу, навіть якщо Wi-Fi вимкнено. Щоб скасувати цей дозвіл, перейдіть у меню Розширені &gt; Сканування завжди доступне."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Програми можуть шукати мережі поблизу, навіть якщо Wi-Fi вимкнено. Щоб скасувати цей дозвіл, перейдіть у меню Розширені &gt; Сканування завжди доступне."</string>
@@ -699,12 +698,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ЗАСТЕРЕЖЕННЯ. Якщо вимкнути Wi‑Fi, планшет використовуватиме лише мобільну мережу для початкових завантажень і оновлень. Щоб уникнути можливого стягнення плати, під’єднайтеся до Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ЗАСТЕРЕЖЕННЯ. Якщо вимкнути Wi‑Fi, пристрій використовуватиме лише мобільну мережу для початкових завантажень і оновлень. Щоб уникнути можливого стягнення плати, під’єднайтеся до Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ЗАСТЕРЕЖЕННЯ. Якщо вимкнути Wi‑Fi, телефон використовуватиме лише мобільну мережу для початкових завантажень і оновлень. Щоб уникнути можливого стягнення плати, під’єднайтеся до Wi‑Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Якщо вимкнути Wi‑Fi:\n\nваш планшет не матиме з’єднання з Інтернетом;\n\nви не отримуватимете оновлення програмного забезпечення, доки не під’єднаєтеся до Інтернету;\n\nви не зможете активувати функції захисту пристрою."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Якщо вимкнути Wi‑Fi:\n\nваш пристрій не матиме з’єднання з Інтернетом;\n\nви не отримуватимете оновлення програмного забезпечення, доки не під’єднаєтеся до Інтернету;\n\nви не зможете активувати функції захисту пристрою."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Якщо вимкнути Wi‑Fi:\n\nваш телефон не матиме з’єднання з Інтернетом;\n\nви не отримуватимете оновлення програмного забезпечення, доки не під’єднаєтеся до Інтернету;\n\nви не зможете активувати функції захисту пристрою."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Планшетний ПК не зміг під’єднатися до цієї мережі Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Пристрій не зміг під’єднатися до цієї мережі Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефон не зміг під’єднатися до цієї мережі Wi-Fi."</string>
@@ -1016,8 +1012,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Це зітре всі дані з "<b>"внутрішньої пам’яті"</b>" вашого планшетного ПК, зокрема:\n\n"<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li>"."</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Буде видалено всі дані з "<b>"внутрішньої пам’яті"</b>" вашого телефона, зокрема:\n\n"<li>"Ваш обліковий запис Google"</li>\n<li>"Дані й налаштування системи та програм"</li>\n<li>"Завантажені програми"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Наразі ви ввійшли в такі облікові записи:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На цьому пристрої є інші користувачі.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фото"</li>\n<li>"Інші дані користувача"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"носій USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"карту SD"</b>"."</string>
@@ -1091,12 +1086,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Вставте SIM-карту та перезапустіть"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Під’єднайтеся до Інтернету"</string>
     <string name="location_title" msgid="1029961368397484576">"Моє місцезнах."</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Робочий профіль"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Місцезнах.для робочого профілю"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Вимкнено вашою компанією"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Висока точність"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Економія заряду акумулятора"</string>
@@ -1856,10 +1848,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Включити дані додатка"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автомат. відновлення"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"У разі повторного встановлення програми відновлювати налаштування та дані з резервних копій"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Служба резервного копіювання неактивна."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Це налаштування встановлено політикою пристрою."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль резерв.копії на ПК"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Повні резервні копії на комп’ютері наразі не захищені"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Торкніться, щоб змінити чи видалити пароль для повного резервного копіювання на комп’ютер"</string>
@@ -2323,8 +2313,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Введіть назву SIM-карти"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Гніздо для SIM-карти %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Оператор"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Номер"</string>
@@ -2334,7 +2323,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"Інші налаштування виклику"</string>
@@ -2500,7 +2488,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Залишити альбомну орієнтацію"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Залишити поточну орієнтацію"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"Інформація про IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Інформація про IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Шифрування"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Продовжити"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Можна додатково захистити пристрій, якщо вводити PIN-код перед увімкненням. Вимкнений пристрій не зможе приймати дзвінки, повідомлення або сповіщення, зокрема сигнали будильника. \n\nЦе допомагає захистити дані на загублених або викрадених пристроях."</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index a449da5..0a8ff5e 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"غیر مربوط کریں؟"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏یہ اس کے ساتھ آپ کے کنکشن کو ختم کر دے گا:&amp;‎lt;br&gt;&lt;‎b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;‎"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"آپ کو بلوٹوتھ ترتیبات میں تبدیلی کرنے کی اجازت نہیں ہے۔"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> بلوٹوتھ کی ترتیبات آن ہونے پر قریبی آلات کیلئے مرئی ہے۔"</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کو منقطع کریں؟"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"نشریات"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"پروفائل غیر فعال کریں؟"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"‏Wi‑Fi، بلوٹوتھ، ہوائی جہاز وضع، سیلولر نیٹ ورکس اور VPNs کا نظم کریں"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"سیلولر ڈیٹا"</string>
     <string name="calls_title" msgid="3544471959217176768">"کالز"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"‏SMS پیغامات"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"سیلولر نیٹ ورک پر ڈیٹا استعمال کرنے دیں"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"رومنگ میں ڈیٹا استعمال کرنے کی اجازت دیں"</string>
     <string name="roaming" msgid="3596055926335478572">"ڈیٹا رومنگ"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"منتظم، مرموز کاری کی پالیسی یا اسناد کے اسٹوریج کے ذریعے غیر فعال کردہ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"کوئی نہیں"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"سوائپ کریں"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"غیر مقفل کرنے کا پاس ورڈ ہٹائیں"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"غیر مقفل کرنے کا پاس ورڈ تبدیل کریں"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"موسیقی اور میڈیا کیلئے"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ترتیبات کو یاد رکھیں"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"‏Wi‑Fi اسسٹنٹ"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"‏Wi‑Fi اسسٹنٹ کے ذریعے منسلک ہے"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"کاسٹ اسکرین"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"وائرلیس ڈسپلے فعال کریں"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"کوئی قریبی آلات نہیں ملے۔"</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"‏Wi‑Fi ترتیبات"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"وائرلیس رسائی پوائنٹس کو ترتیب دیں اور ان کا نظم کریں"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"‏Wi‑Fi نیٹ ورک منتخب کریں"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"‏Wi‑Fi منتخب کریں"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"‏Wi‑Fi آن ہو رہا ہے…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"‏Wi‑Fi آف ہو رہا ہے…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"اسکین کرنا ہمیشہ دستیاب رہے"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"ہمیشہ اسکیننگ کی اجازت دیں"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"‏Google کی مقام کی سروس اور دوسری ایپس کو Wi-Fi آف ہونے پر بھی نیٹ ورکس اسکین کرنے دیں"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"‏عوامی Wi‑Fi خودکار طور پر استعمال کریں"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"‏Wi Fi اسسٹنٹ کو اعلی معیار کے عوامی نیٹ ورکس سے خودکار طور پر منسلک ہونے دیں"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"اسسٹنٹ منتخب کریں"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"سرٹیفکیٹس انسٹال کریں"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"‏مقام کی قطعیت کو بہتر بنانے اور دوسرے مقاصد کیلئے، Google اور دوسری ایپس Wi-Fi آف ہونے پر بھی قریبی نیٹ ورکس کو اسکین کرسکتی ہیں۔ اگر آپ نہیں چاہتے ہیں کہ ایسا ہوا تو جدید &gt; اسکیننگ ہمیشہ دستیاب ہے پر جائیں۔"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"‏Wi-Fi آف ہونے پر بھی ایپس قریبی نیٹ ورکس کو اسکین کرسکتی ہیں۔ اگر آپ نہیں چاہتے ہیں کہ ایسا ہوا تو جدید &gt; اسکیننگ ہمیشہ دستیاب ہے پر جائیں۔"</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"‏وارننگ: اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو آپ کا ٹیبلیٹ ابتدائی ڈاؤن لوڈز اور اپ ڈیٹس کیلئے صرف سیلولر ڈیٹا استعمال کرے گا۔ ممکنہ ڈیٹا چارجز سے بچنے کیلئے، Wi‑Fi سے مربوط ہوں۔"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"‏وارننگ: اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو آپ کا آلہ ابتدائی ڈاؤن لوڈز اور اپ ڈیٹس کیلئے صرف سیلولر ڈیٹا استعمال کرے گا۔ ممکنہ ڈیٹا چارجز سے بچنے کیلئے، Wi‑Fi سے مربوط ہوں۔"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"‏وارننگ: اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو آپ کا فون ابتدائی ڈاؤن لوڈز اور اپ ڈیٹس کیلئے صرف سیلولر ڈیٹا استعمال کرے گا۔ ممکنہ ڈیٹا چارجز سے بچنے کیلئے، Wi‑Fi سے مربوط ہوں۔"</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"‏اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو:\n\nآپ کے ٹیبلیٹ میں ایک انٹرنیٹ کنکشن نہیں ہوگا۔\n\nآپ کو اس وقت تک سافٹ ویئر سے متعلق اپ ڈیٹس موصول نہیں ہونگی جب تک آپ انٹرنیٹ سے منسلک نہیں ہو جاتے ہیں۔\n\nآپ اس وقت آلہ کے تحفظ سے متعلق خصوصیات کو فعال نہیں کر سکتے ہیں۔"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"‏اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو:\n\nآپ کے آلہ میں ایک انٹرنیٹ کنکشن نہیں ہوگا۔\n\nآپ کو اس وقت تک سافٹ ویئر سے متعلق اپ ڈیٹس موصول نہیں ہونگی جب تک آپ انٹرنیٹ سے منسلک نہیں ہو جاتے۔\n\nآپ اس وقت آلہ کے تحفظ سے متعلق خصوصیات کو فعال نہیں کر سکتے ہیں۔"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"‏اگر آپ Wi‑Fi کو نظر انداز کر دیتے ہیں تو:\n\nآپ کے فون میں ایک انٹرنیٹ کنکشن نہیں ہوگا۔\n\nآپ کو اس وقت تک سافٹ ویئر سے متعلق اپ ڈیٹس موصول نہیں ہونگی جب تک آپ انٹرنیٹ سے منسلک نہیں ہو جاتے ہیں۔\n\nآپ اس وقت آلہ کے تحفظ سے متعلق خصوصیات کو فعال نہیں کر سکتے ہیں۔"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"‏ٹیبلٹ اس Wi‑Fi نیٹ ورک سے مربوط نہیں ہو سکا۔"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"‏آلہ اس Wi‑Fi نیٹ ورک سے مربوط نہیں ہو سکا۔"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"‏فون اس Wi‑Fi نیٹ ورک سے مربوط نہیں ہو سکا۔"</string>
@@ -836,7 +836,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"خود کار چمک"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"جگانے کیلئے اٹھائیں"</string>
     <string name="doze_title" msgid="2259176504273878294">"ایمبی اینٹ ڈسپلے"</string>
-    <string name="doze_summary" msgid="7128970177894383698">"آلہ کو لینے یا اطلاعات موصول ہونے پر اسکرین کو آن کریں"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"آلہ کو اٹھانے یا اطلاعات موصول ہونے پر اسکرین کو آن کریں"</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>
@@ -1016,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏یہ آپ کے ٹیبلٹ کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو حذف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"‏یہ آپ کے فون کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو حذف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"آپ فی الحال مندرجہ ذیل اکاؤنٹس میں سائن ان ہیں:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"اس آلہ پر دوسرے صارفین موجود ہیں۔\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"موسیقی"</li>\n<li>"تصاویر"</li>\n<li>"صارف کا دیگر ڈیٹا"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا، "<b>"USB اسٹوریج"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا صاف کرنے کیلئے، "<b>"SD کارڈ"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
@@ -1091,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"‏براہ کرم SIM کارڈ داخل کرکے دوبارہ شروع کریں"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"براہ کرم انٹرنیٹ سے مربوط کریں"</string>
     <string name="location_title" msgid="1029961368397484576">"میرا مقام"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"دفتری پروفائل"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"دفتری پروفائل کیلئے مقام"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"آپ کی کمپنی نے آف کر دیا"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"وضع"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"اعلی درستگی"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"بیٹری کی بچت"</string>
@@ -1444,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"چارج ہوتے وقت اسکرین کبھی بھی سلیپ وضع میں نہيں جائے گی"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"‏بلوٹوتھ HCI کا جاسوسی لاگ فعال کریں"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"‏سبھی بلوٹوتھ HCI کے پیکٹس ایک فائل میں قید کریں"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"‏OEM اَن لاکنگ"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"بوٹ لوڈر کو غیر مقفل ہونے کی اجازت دیں"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"‏اپنا PIN درج کریں"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"‏OEM اَن لاک کو فعال کرنے کیلئے اپنے آلے کا PIN درج کریں۔"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"‏OEM اَن لاکنگ کی اجازت دیں؟"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"انتباہ: یہ ترتیب آن ہونے پر آلہ کے تحفظ کی خصوصیات اس آلہ پر کام نہیں کریں گی۔"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"وائرلیس ڈسپلے سرٹیفیکیشن"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏Wi‑Fi وربوس لاگنگ فعال کریں"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏جارحانہ Wi‑Fi سے سیلولر ہینڈ اوور"</string>
@@ -1860,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"ایپ کا ڈیٹا شامل کریں"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"خود کار طور بحال کریں"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"کسی ایپ کو دوبارہ انسٹال کرتے وقت بیک اپ ترتیبات اور ڈیٹا کو بحال کریں"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"بیک اپ سروس غیر فعال ہے۔"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"اسے آپ کے آلہ کی پالیسی کے ذریعے سیٹ کیا جاتا ہے۔"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"ڈیسک ٹاپ کا بیک اپ پاس ورڈ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ڈیسک ٹاپ کے مکمل بیک اپس فی الحال محفوظ کیے ہوئے نہیں ہیں"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ڈیسک ٹاپ کے مکمل بیک اپس کیلئے پاس ورڈ کو تبدیل کرنے یا ہٹانے کیلئے ٹچ کریں"</string>
@@ -2015,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"‏سکرین کی ساخت بنانے کیلئے ہمیشہ GPU استعمال کریں"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"رنگ کی جگہ کو تحریک دیں"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"‏OpenGL ٹریسز کو فعال کریں"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"‏AwesomePlayer استعمال کریں (فرسودہ)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"‏اکثر میڈیا پلے بیک کیلئے NuPlayer کی بجائے AwesomePlayer استعمال کریں"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"‏USB آڈیو روٹنگ غیر فعال کریں"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"‏USB آڈیو پیریفیرلز کیلئے خودکار روٹنگ غیرفعال کریں"</string>
     <string name="debug_layout" msgid="5981361776594526155">"لے آؤٹ کی حدیں دکھائیں"</string>
@@ -2329,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"‏SIM کا نام درج کریں"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"‏SIM سلاٹ ‎%1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"کیریئر"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"نمبر"</string>
@@ -2340,7 +2327,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"کال کی دیگر ترتیبات"</string>
@@ -2484,8 +2470,8 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"وقت آغاز"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"وقت اختتام"</string>
     <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> اگلے دن"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> یا اس سے پہلے کوئی الارم"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> اگلے دن یا اس سے پہلے کوئی الارم"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> یا اس سے پہلے کوئی بھی الارم"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> اگلے دن یا اس سے پہلے کوئی بھی الارم"</string>
     <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>
@@ -2506,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"لینڈ اسکیپ منظر میں رہیں"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"موجودہ سمت بندی میں رہیں"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"‏IMEI کی معلومات"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"‏IMEI سے متعلق معلومات"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"مرموز کاری"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"جاری رکھیں"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"‏آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 571ea66..76a688f 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Uzilsinmi?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Quyidagi qurilma bilan aloqa uziladi:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Sizda Bluetooth sozlamalarini o‘zgartirish uchun ruxsat yo‘q."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"Bluetooth soz-lari ochilganda “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>” yaqindagi quril-ga ko‘rinadi."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bilan aloqa uzilsinmi?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Signal uzatish"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil o‘chirib qo‘yilsinmi?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Wi‑Fi, Bluetooth, parvoz rejimi, mobil tarmoq va VPN tarmoqlarni boshqarish"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Mobil internet"</string>
     <string name="calls_title" msgid="3544471959217176768">"Qo‘ng‘iroqlar"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"SMS xabarlar"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Mobil internetdan foydalanishga ruxsat"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Roumingda mob. int-dan foyd-sh"</string>
     <string name="roaming" msgid="3596055926335478572">"Ma‘lumotlar roumingi"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"O‘rtachadan yuqoriga darajasidagi xavfsizlik"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parol"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Yuqori darajadagi xavfsizlik"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Administrator, shifrlash siyosati, yoki hisob ma‘lumotlari ombori tomonidan o‘chirib qo‘yilgan"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Bo‘sh"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Ekran bo‘ylab surish"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Chizmali parolni olib tashlash"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Qulfni ochish PIN kodini o‘chirish"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Qulfni ochish parolini o‘chirish"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Chizmali qulfni ochishni o‘zgartirish"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Qulfdan ochish PIN kodini o‘zgartirish"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Qulfni ochish parolini o‘zgartirish"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musiqa va media uchun"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Sozlamalarni eslab qolish"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi yordamchisi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi yordamchisi orqali ulangan"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Aks beruvchi erkan"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Simsiz displeyni yoqish"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Atrofda qurilmalar topilmadi."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi sozlamalari"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ulanish nuqtalarini sozlash &amp; boshqarish"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Wi-Fi tarmog‘ini tanlang"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi tarmog‘ini tanlash"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi yoqilmoqda…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi o‘chirilmoqda…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scanlash har doim yoqilgan"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Har doim izlashga ruxsat berilsin"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Wi-Fi moduli o‘chirilgan bo‘lsa-da, Google joylashuvni aniqlash xizmati va boshqa ilovalarga tarmoqlarni izlashga ruxsat berish"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Ochiq Wi-Fi tarmog‘iga avtomatik ulanish"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi-Fi yordamchisiga ochiq tarmoqlar ichidan eng kuchlisiga avtomatik ulanishi uchun ruxsat bering"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"Yordamchini tanlang"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifikatlarni o‘rnatish"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Joylashuv aniqligini yana ham yaxshilash va boshqa maqsadlar uchun, Wi-Fi o‘chirilgan bo‘lsada Google va boshqa ilovlar atrofdagi tarmoqlarni skanlashlari mumkin. Buni istamasangiz, Qoshimcha &gt; Har doim mavjud tarmoqlarni skanlash menusiga o‘ting."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-Fi o‘chirilgan bo‘lsada, ilovalar atrofdagi tarmoqlarni skanlashlari mumkin. Buni istamasangiz, Qoshimcha &gt; Har doim mavjud tarmoqlarni skanlash menusiga o‘ting."</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"OGOHLANTIRISH: Agar Wi-Fi tarmog‘iga ulanmasdan o‘tkazib yuborsangiz, planshetingiz dastlabki yuklab olinadigan narsalar va yangilanishlarni olish uchun faqat mobil internetdan foydalana oladi xolos. Mobil internet xarajatlarining oldini olish uchun Wi-Fi tarmog‘iga ulaning."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"OGOHLANTIRISH: Agar Wi-Fi tarmog‘iga ulanmasdan o‘tkazib yuborsangiz, qurilmangiz dastlabki yuklab olinadigan narsalar va yangilanishlarni olish uchun faqat mobil internetdan foydalana oladi xolos. Mobil internet xarajatlarining oldini olish uchun Wi-Fi tarmog‘iga ulaning."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"OGOHLANTIRISH: Agar Wi-Fi tarmog‘iga ulanmasdan o‘tkazib yuborsangiz, telefonngiz dastlabki yuklab olinadigan narsalar va yangilanishlarni olish uchun faqat mobil internetdan foydalana oladi xolos. Mobil internet xarajatlarining oldini olish uchun Wi-Fi tarmog‘iga ulaning."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Agar Wi‑Fi o‘tkazib yuborilsa:\n\nPlanshetingiz internetga ulana olmaydi.\n\nInternetga ulanmaguncha, dasturiy yangilanishlarni o‘rnata olmaysiz.\n\nQurilmani himoyalash funksiyalarini faollashtira olmaysiz."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Agar Wi‑Fi o‘tkazib yuborilsa:\n\nQurilmangiz internetga ulana olmaydi.\n\nInternetga ulanmaguncha, dasturiy yangilanishlarni o‘rnata olmaysiz.\n\nQurilmani himoyalash funksiyalarini faollashtira olmaysiz."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Agar Wi‑Fi o‘tkazib yuborilsa:\n\nTelefoningiz internetga ulana olmaydi.\n\nInternetga ulanmaguncha, dasturiy yangilanishlarni o‘rnata olmaysiz.\n\nQurilmani himoyalash funksiyalarini faollashtira olmaysiz."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Planshet bu Wi‑Fi tarmog‘iga ulanmadi."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Qurilma ushbu Wi-Fi tarmog‘iga ulana olmadi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon bu Wi‑Fi tarmog‘iga ulanmadi."</string>
@@ -1016,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Bu planshetning "<b>"ichki xotirasi"</b>"dagi barcha ma\'lumotlarni o\'chirib yuboradi, jumladan:\n\n"<li>"Sizning Google hisobingiz"</li>\n<li>"Tizim va ilovalar ma\'lumotlari va sozlamalari"</li>\n<li>"Ko\'chirib olingan ilovalar"</li>"ni."</string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Bu telefoningizdagi "<b>"ichki xotira"</b>"dan,\n\n"<li>" Google hisobingiz"</li>\n<li>"Tizim va ilovalar sozlamalari"</li>\n<li>"Ko‘chirib olingan ilovalar"</li>" kabi barcha ma‘lumotlarni o‘chirib yuboradi."</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Siz hozir tizimga quyidagi hisoblardan kirgansiz:\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu qurilmada boshqa foydalanuvchilar ham bor.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiqa"</li>\n<li>"Rasmlar"</li>\n<li>"Foydalanuvchining boshqa ma\'lumotlari"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Musiqa, rasmlar, foydalanuvchining boshqa ma\'lumotlarini o\'chirish uchun, "<b>"USB xotira"</b>" tozalanishi kerak."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musiqa, rasmlar, va boshqa ma\'lumotlarni o‘chirish uchun, "<b>"SD karta"</b>"ni tozalash kerak."</string>
@@ -1091,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Iltimos, SIM kartani joylashtirib, qurilmani ochirib-yoqing"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Iltimos, Internetga ulaning"</string>
     <string name="location_title" msgid="1029961368397484576">"Mening joylashuvim"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Ishchi profil"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ishchi profil joyi"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Kompaniya tomonidan o‘ch-gan"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Rejim"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Yuqori darajadagi aniqlik"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batareyani tejash"</string>
@@ -1444,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran quvvatlanish paytida hech qachon o‘chmaydi"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI kuzatish jurnalini yoqish"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Barcha bluetooth HCI paketlarini bitta faylda jamlash"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM qulfini yechish"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Operatsion tizimni yuklovchi dastur qulfini yechish"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"PIN kodni kiriting"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"“OEM qulfini yechish” funksiyasini yoqish uchun qurilmangiz PIN kodini kiriting"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"“OEM qulfini yechish” funksiyasi yoqilsinmi?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"OGOHLANTIRISH: Ushbu funksiya yoqilsa, qurilmani himoyalash funksiyasi ishlamay qoladi."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Displeyning simsiz sertifikatsiyasi"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi-Fi jurnalidagi batafsil ma’lumot"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi’dan mob. internetga majburiy o‘tish"</string>
@@ -1860,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Ilova ma’lumotini ham qo‘shish"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Avtomatik qayta tiklash"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ilovani qayta o‘rnatish paytida, zahiralangan sozlamalar va ma’lumotlarni tiklang"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Zaxiralash xizmati faol emas."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Bu qurilma siyosati tomonidan o‘rnatilgan."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Ish stolini zahiralash paroli"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Kompyuterdagi zaxira nusxalar hozirgi vaqtda himoyalanmagan"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Ish stoli to\'liq zaxira nusxalari parolini o‘zgartirish yoki o‘chirish uchun bu yerni bosing."</string>
@@ -2015,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Ekranda tasvirlarni biriktirish uchun har doim GPU‘dan foydalanish"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Rang maydonini simulyatsiyalash"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL tahlil dasturini yoqish"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"AwesomePlayer foyd-sh (tav. etilmaydi)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Ijro qilish u-n NuPlayer o‘rniga AwesomePlayer’dan foyd-sh"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB audio-yo‘naltirishni o‘chirish"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Tashqi USB audio qur-ga avto-yo‘naltirishni o‘chirish"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Joylashuv chegaralarini ko‘rsatish"</string>
@@ -2329,8 +2317,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>-SIM"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM karta uyasi bo‘sh"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM karta nomi"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM karta nomini kiriting"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"%1$d-SIM karta teshigi"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Aloqa operatori"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Raqam"</string>
@@ -2340,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Binafsharang"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM karta solinmagan"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM karta holati"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"SIM kartaga aloqador ma’lumotlar"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Birlamchi SIM kartadan qaytarib qo‘ng‘iroq qilish"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Chiqish qo‘ng‘iroqlari uchun mo‘ljallangan SIM karta"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Boshqa qo‘ng‘iroq sozlamalari"</string>
@@ -2506,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI ma’lumotlari"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI raqamiga aloqador ma’lumotlar"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Shifrlash"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Davom etish"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Qurilmani ishga tushirishda PIN-kod talab qilish orqali uni yanada kuchliroq himoyalashingiz mumkin. Qurilma ishga tushmaguncha, u qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallarini qabul qila olmaydi. \n\nBu yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9433f1e..fbfa163 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ngắt kết nối?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tác vụ này sẽ kết thúc kết nối của bạn với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Bạn không có quyền thay đổi cài đặt Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> hiển thị với t.bị lân cận khi C.đặt Bluetooth mở."</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ngắt kết nối <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Phát sóng"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vô hiệu hồ sơ?"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Quản lý Wi-Fi, Bluetooth, chế độ trên máy bay, mạng di động và VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Dữ liệu di động"</string>
     <string name="calls_title" msgid="3544471959217176768">"Cuộc gọi"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Tin nhắn SMS"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"Cho phép sử dụng dữ liệu qua mạng d.động"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Cho phép SD d.liệu khi ch.vùng"</string>
     <string name="roaming" msgid="3596055926335478572">"Chuyển vùng dữ liệu"</string>
@@ -399,6 +401,8 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Mức độ bảo mật từ trung bình đến cao"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mật khẩu"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Mức độ bảo mật cao"</string>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Bị vô hiệu do quản trị viên, chính sách mã hóa hoặc bộ nhớ thông tin xác thực"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Không"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Vuốt"</string>
@@ -410,6 +414,8 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Xóa hình mở khóa"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Xóa mã PIN mở khóa"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Xóa mật khẩu mở khóa"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Thay đổi hình mở khóa"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Thay đổi mã PIN mở khóa"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Thay đổi mật khẩu mở khóa"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Cho nhạc và phương tiện"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Nhớ cài đặt"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Trình hỗ trợ Wi‑Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Được kết nối qua trình hỗ trợ Wi‑Fi"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Màn hình truyền"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Bật hiển thị không dây"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Không tìm thấy thiết bị lân cận nào."</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Cài đặt Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Thiết lập &amp; quản lý điểm truy cập mạng"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Chọn mạng Wi‑Fi"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Chọn Wi‑Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Đang bật Wi‑Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Đang tắt Wi‑Fi…"</string>
@@ -696,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"CẢNH BÁO: Nếu bạn bỏ qua Wi‑Fi, máy tính bảng của bạn sẽ chỉ sử dụng dữ liệu di động cho bản cập nhật và tải xuống ban đầu. Để không phải trả phí dữ liệu, hãy kết nối với Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"CẢNH BÁO: Nếu bạn bỏ qua Wi‑Fi, thiết bị của bạn sẽ chỉ sử dụng dữ liệu di động cho bản cập nhật và tải xuống ban đầu. Để không phải trả phí dữ liệu, hãy kết nối với Wi‑Fi."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"CẢNH BÁO: Nếu bạn bỏ qua Wi‑Fi, điện thoại của bạn sẽ chỉ sử dụng dữ liệu di động cho bản cập nhật và tải xuống ban đầu. Để không phải trả phí dữ liệu, hãy kết nối với Wi‑Fi."</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"Nếu bạn bỏ qua Wi-Fi:\n\nMáy tính bảng của bạn sẽ không có kết nối Internet.\n\nBạn sẽ không nhận được bản cập nhật phần mềm cho đến khi bạn kết nối Internet.\n\nTại thời điểm này, bạn không thể kích hoạt tính năng bảo vệ thiết bị."</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"Nếu bạn bỏ qua Wi-Fi:\n\nThiết bị của bạn sẽ không có kết nối Internet.\n\nBạn sẽ không nhận được bản cập nhật phần mềm cho đến khi bạn kết nối Internet.\n\nTại thời điểm này, bạn không thể kích hoạt tính năng bảo vệ thiết bị."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"Nếu bạn bỏ qua Wi-Fi:\n\nĐiện thoại của bạn sẽ không có kết nối Internet.\n\nBạn sẽ không nhận được bản cập nhật phần mềm cho đến khi bạn kết nối Internet.\n\nTại thời điểm này, bạn không thể kích hoạt tính năng bảo vệ thiết bị."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Máy tính bảng không thể kết nối với mạng Wi‑Fi này."</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"Thiết bị không thể kết nối với mạng Wi‑Fi này."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Điện thoại không thể kết nối với mạng Wi‑Fi này."</string>
@@ -1087,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vui lòng lắp thẻ SIM và khởi động lại"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Vui lòng kết nối internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Vị trí của tôi"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Hồ sơ công việc"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Vị trí của hồ sơ công việc"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"Đã được công ty bạn tắt"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Chế độ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Độ chính xác cao"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Tiết kiệm pin"</string>
@@ -1440,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Màn hình sẽ không bao giờ chuyển sang chế độ nghỉ khi sạc"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bật nhật ký theo dõi HCI Bluetooth"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Giữ tất cả các gói HCI bluetooth trong một tệp"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"Mở khóa OEM"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Cho phép mở khóa trình khởi động"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Nhập mã PIN của bạn"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Nhập mã PIN thiết bị của bạn để bật tính năng mở khóa OEM"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Cho phép mở khóa OEM?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"CẢNH BÁO: Tính năng Bảo vệ thiết bị sẽ không hoạt động trên thiết bị này trong khi bạn bật cài đặt này."</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Chứng nhận hiển thị không dây"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Bật ghi nhật ký chi tiết Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Chuyển vùng Wi‑Fi tích cực sang mạng DĐ"</string>
@@ -1856,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Bao gồm dữ liệu ứng dụng"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Tự động khôi phục"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Khi cài đặt lại một ứng dụng, khôi phục dữ liệu và cài đặt đã sao lưu"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"Dịch vụ sao lưu không hoạt động."</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"Tùy chọn này do chính sách thiết bị của bạn đặt."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"MK sao lưu của m.tính"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Sao lưu toàn bộ tới máy tính hiện không được bảo vệ"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Chạm để thay đổi hoặc xóa mật khẩu dành cho bộ sao lưu toàn bộ tới máy tính"</string>
@@ -2011,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Luôn sử dụng GPU để tổng hợp màn hình"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"Mô phỏng không gian màu"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Bật theo dõi OpenGL"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"Dùng AwesomePlayer (ko dùng nữa)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Dùng AwesomePlayer thay vì NuPlayer cho hầu hết phát lại phương tiện"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Tắt định tuyến âm thanh USB"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Tắt định tuyến tự động tới thiết bị âm thanh ngoại vi USB"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Hiển thị ranh giới bố cục"</string>
@@ -2325,8 +2317,7 @@
     <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">"Không có SIM"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Tên SIM"</string>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"Nhập tên SIM"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"Khe cắm thẻ SIM %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Nhà cung cấp dịch vụ"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Số"</string>
@@ -2336,7 +2327,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Tía"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Không có thẻ SIM nào được lắp"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Trạng thái SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Thông tin liên quan tới SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Gọi lại từ SIM mặc định"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM cho các cuộc gọi đi"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Cài đặt cuộc gọi khác"</string>
@@ -2502,7 +2492,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Thông tin IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Thông tin liên quan đến IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Mã hóa"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Tiếp tục"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mã PIN của mình trước khi khởi động thiết bị. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức cho đến khi khởi động thiết bị. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc lấy cắp."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 34dce42..e38c2a2 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"要断开连接吗？"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"此操作将会断开您与以下设备的连接：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"您无权更改蓝牙设置。"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"在<xliff:g id="DEVICE_NAME">%1$s</xliff:g>上开启蓝牙设置后，附近的设备将可以检测到该设备。"</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"要断开与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的连接吗？"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"广播"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"要停用配置文件吗？"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"管理WLAN、蓝牙、飞行模式、移动网络和VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"移动数据网络"</string>
     <string name="calls_title" msgid="3544471959217176768">"通话"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"短信"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"允许使用移动数据网络"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"允许漫游时使用数据流量"</string>
     <string name="roaming" msgid="3596055926335478572">"移动数据网络漫游"</string>
@@ -383,9 +385,9 @@
     <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>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"更改锁定屏幕"</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_enable_summary" msgid="4791110798817242301">"选择锁定屏幕的方法"</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>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"由于管理员、加密策略或凭据存储的要求，您无法使用此选项"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"无"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"滑动"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"删除解锁密码"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"更改解锁密码"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"用于音乐和媒体"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"记住设置"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"WLAN助手"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"已连接（通过 WLAN 助手）"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"投射屏幕"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"开启无线显示"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"未在附近找到设备。"</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"WLAN设置"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"WLAN"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"设置和管理无线接入点"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"选择 WLAN 网络"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"选择WLAN网络"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"正在打开WLAN…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"正在关闭WLAN…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"随时都可扫描"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"始终允许扫描网络"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"允许Google的位置信息服务和其他应用扫描网络（即使WLAN已关闭）"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"自动使用开放的 WLAN 网络"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"允许 WLAN 助手自动连接到评定为优质的开放网络上"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"选择助手"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安装证书"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"为了提高位置信息精确度以及其他目的，Google 和其他应用可扫描附近的网络（在关闭了WLAN时也可进行扫描）。如果您不希望应用这么做，请进入“高级”&gt;“随时都可扫描”进行设置。"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"应用可扫描附近的网络（在关闭了WLAN时也可进行扫描）。如果您不希望应用这么做，请进入“高级”&gt;“随时都可扫描”进行设置。"</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"警告：如果您跳过WLAN网络设置，您的平板电脑将只能通过移动数据网络进行初始下载和更新。为了避免产生数据流量费，请连接到WLAN网络。"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"警告：如果您跳过WLAN网络设置，您的设备将只能通过移动数据网络进行初始下载和更新。为了避免产生数据流量费，请连接到WLAN网络。"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"警告：如果您跳过WLAN网络设置，您的手机将只能通过移动数据网络进行初始下载和更新。为了避免产生数据流量费，请连接到WLAN网络。"</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"如果您跳过 WLAN 网络设置：\n\n您的平板电脑将不会连接到互联网。\n\n您必须先连接到互联网，才能获取软件更新。\n\n您目前将无法启用设备保护功能。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"如果您跳过 WLAN 网络设置：\n\n您的设备将不会连接到互联网。\n\n您必须先连接到互联网，才能获取软件更新。\n\n您目前将无法启用设备保护功能。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"如果您跳过 WLAN 网络设置：\n\n您的手机将不会连接到互联网。\n\n您必须先连接到互联网，才能获取软件更新。\n\n您目前将无法启用设备保护功能。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"平板电脑无法连接到此WLAN网络。"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"设备无法连接到此WLAN网络。"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"手机无法连接到此WLAN网络。"</string>
@@ -1016,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"此操作会清除您平板电脑"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐户"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"此操作会清除您手机"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐户"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前，您已登录以下帐户：\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"此设备上目前还有其他用户。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音乐"</li>\n<li>"照片"</li>\n<li>"其他的用户数据"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"要清除音乐、照片和其他用户数据，请清空该 "<b>"USB存储设备"</b>"。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"要清除音乐、图片和其他用户数据，您需要清空该 "<b>"SD卡"</b>"。"</string>
@@ -1091,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"请插入SIM卡，然后重新启动"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"请连接到互联网"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"工作资料"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"工作资料存储位置"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"您的公司已将其关闭"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"准确度高"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"耗电量低"</string>
@@ -1444,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充电时屏幕不会休眠"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"启用蓝牙 HCI 信息收集日志"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"捕获单个文件中的所有蓝牙 HCI 包"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM 解锁"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"允许解锁引导加载程序"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"输入您的 PIN 码"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"输入您的设备 PIN 码即可启用 OEM 解锁"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"要允许 OEM 解锁吗？"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告：如果开启此设置，此设备上的设备保护功能将无法使用。"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"无线显示认证"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"启用WLAN详细日志记录功能"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"主动从WLAN网络切换到移动数据网络"</string>
@@ -1860,10 +1852,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"包括应用数据"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自动还原"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"重新安装某个应用后，系统会还原已经备份的设置和数据"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"备份服务未启用。"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"这是由您的设备规范所设定的。"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"桌面备份密码"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"桌面完整备份当前未设置密码保护"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"触摸可更改或删除用于桌面完整备份的密码"</string>
@@ -2015,10 +2005,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"始终使用 GPU 进行屏幕合成"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"模拟颜色空间"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"启用 OpenGL 跟踪"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"使用 AwesomePlayer（已弃用）"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"使用 AwesomePlayer（取代 NuPlayer）播放大多数媒体内容"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"关闭USB音频转接"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"关闭自动转接至USB音频外围设备的功能"</string>
     <string name="debug_layout" msgid="5981361776594526155">"显示布局边界"</string>
@@ -2329,8 +2317,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"输入 SIM 卡名称"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM 卡插槽 %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"运营商"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"号码"</string>
@@ -2340,7 +2327,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"其他通话设置"</string>
@@ -2484,8 +2470,8 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"开始时间"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"结束时间"</string>
     <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"次日 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> 或任何早于该时间的闹钟响铃时"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"次日 <xliff:g id="FORMATTED_TIME">%s</xliff:g> 或任何早于该时间的闹钟响铃时"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> 或早于该时间的闹钟响铃时"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"次日 <xliff:g id="FORMATTED_TIME">%s</xliff:g> 或早于该时间的闹钟响铃时"</string>
     <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>
@@ -2506,7 +2492,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"保持横向"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持当前方向"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI信息"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI相关信息"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"加密"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"继续"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"您可以要求在设备启动前输入 PIN 码，为此设备提供进一步的保护。在启动前，该设备将无法接听电话、接收短信或通知（包括闹钟提醒）。\n\n这有助于保护丢失或被盗设备上的数据。"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 9832202..be750cb 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"中斷連線？"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"這樣會結束您與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"您沒有變更藍牙設定的權限。"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"開啟藍牙設定時，附近的裝置可偵測到 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>。"</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"解除與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」的連結？"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"廣播"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"停用個人資料？"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"管理 Wi-Fi、藍牙、飛行模式、流動網絡和 VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"流動數據"</string>
     <string name="calls_title" msgid="3544471959217176768">"通話"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"短訊"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"允許流動網絡數據用量"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"允許漫遊時使用數據"</string>
     <string name="roaming" msgid="3596055926335478572">"數據漫遊"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"已由管理員、加密政策或認證儲存空間停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"無"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"快速滑動"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"移除解鎖密碼"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"用於音樂與媒體"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"記住設定"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"已透過 Wi-Fi 小幫手連線"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"放送螢幕"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"啟用無線螢幕分享"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"找不到附近的裝置。"</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi 設定"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"設定和管理無線網絡接入點"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"選取 Wi-Fi 網絡"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"選取 Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"正在開啟 Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"正在關閉 Wi-Fi…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"永遠可掃瞄"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"永遠執行掃描"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"允許 Google 的位置服務和其他應用程式掃描網絡 (即使 Wi-Fi 已關閉)"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"自動使用開放的 Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"讓 Wi‑Fi 小幫手自動連線至優質的開放網絡"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"選擇小幫手"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安裝憑證"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"為了提高位置精確度並用作其他用途，即使 Wi-Fi 已關閉，Google 和其他應用程式亦可能會掃瞄附近的網絡。如不想啟用此功能，可前往 [進階] &gt; [永遠可掃瞄] 更改設定。"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"即使 Wi-Fi 已關閉，應用程式亦可能會掃瞄附近的網絡。如不想啟用此功能，可前往 [進階] &gt; [永遠可掃瞄] 更改設定。"</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"警告：如果略過 Wi-Fi 設定，平板電腦將只能透過流動數據連線，以作初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網絡。"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"警告：如果略過 Wi-Fi 設定，裝置將只能透過流動數據連線，以作初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網絡。"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"警告：如果略過 Wi-Fi 設定，手機將只能透過流動數據連線，以作初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網絡。"</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"如果略過 Wi-Fi 設定：\n\n您的平板電腦將無法連線至互聯網。\n\n您必須連線至互聯網，才能取得軟件更新。\n\n目前無法啟用裝置保護功能。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"如果略過 Wi-Fi 設定：\n\n您的裝置將無法連線至互聯網。\n\n您必須連線至互聯網，才能取得軟件更新。\n\n這時，您無法啟用裝置保護功能。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"如果略過 Wi-Fi 設定：\n\n您的手機將無法連線至互聯網。\n\n您必須連線至互聯網，才能取得軟件更新。\n\n目前無法啟用裝置保護功能。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"平板電腦無法連接這個 Wi-Fi 網絡。"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"裝置無法連線至這個 Wi-Fi 網絡。"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"手機無法連接這個 Wi-Fi 網絡。"</string>
@@ -836,7 +836,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"舉起即可喚醒"</string>
     <string name="doze_title" msgid="2259176504273878294">"環境顯示"</string>
-    <string name="doze_summary" msgid="7128970177894383698">"拿起裝置或收到通知時喚醒螢幕"</string>
+    <string name="doze_summary" msgid="7128970177894383698">"當您拿起裝置或收到通知時，喚醒螢幕"</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>
@@ -1016,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"這會清除您手機"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"您目前已登入下列帳戶：\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"這部裝置上還有其他使用者。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"SD 記憶卡"</b>"資料。"</string>
@@ -1091,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"請插入 SIM 卡，並重新啟動裝置"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"請連接互聯網"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"工作設定檔"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"工作設定檔的位置"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"已由貴公司關閉"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精確度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"省電模式"</string>
@@ -1444,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時螢幕永不休眠"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"啟用藍牙 HCI 窺探記錄"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"原始設備製造商 (OEM) 解鎖"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"允許 Bootloader 被解鎖"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"請輸入 PIN"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"請輸入您的裝置 PIN，以啟用原始設備製造商 (OEM) 解鎖"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"允許原始設備製造商 (OEM) 解鎖嗎？"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告：這項設定開啟時，這部裝置上的裝置保護功能將無法運作。"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"無線螢幕分享認證"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"啟用 Wi‑Fi 詳細記錄"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"加強 Wi-Fi 至流動數據轉換"</string>
@@ -1864,10 +1856,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"包括應用程式數據"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自動還原"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"當重新安裝應用程式時，還原已備份的設定和資料"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"備份服務目前停用。"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"本服務由您的裝置政策設定。"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"桌面電腦備份密碼"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"桌上電腦的完整備份目前未受保護"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"輕觸即可更改或移除桌上電腦完整備份的密碼"</string>
@@ -2019,10 +2009,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"永遠使用 GPU 進行畫面合成"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"模擬色彩空間"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"啟用 OpenGL 追蹤"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"使用 AwesomePlayer (已淘汰)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"使用 AwesomePlayer 代替 NuPlayer 播放大部分媒體"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"停用 USB 音效檔案路由功能"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"停用 USB 音效檔案周邊設備的自動路由功能"</string>
     <string name="debug_layout" msgid="5981361776594526155">"顯示版面界限"</string>
@@ -2333,8 +2321,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"輸入 SIM 名稱"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM 卡插槽 %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"流動網絡供應商"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"電話號碼"</string>
@@ -2344,7 +2331,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"其他通話設定"</string>
@@ -2487,9 +2473,9 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"星期一至星期五晚"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"開始時間"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"完結時間"</string>
-    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"隔天 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
-    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> 或任何早於該時間的鬧鐘鈴響時"</string>
-    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"隔天 <xliff:g id="FORMATTED_TIME">%s</xliff:g> 或任何早於該時間的鬧鐘鈴響時"</string>
+    <string name="zen_mode_end_time_priority_next_day_summary_format" msgid="2910982148167785730">"下一天<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_none_same_day_summary_format" msgid="2002665300812473888">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>或任何之前的鬧鐘"</string>
+    <string name="zen_mode_end_time_none_next_day_summary_format" msgid="732719357166551378">"下一天<xliff:g id="FORMATTED_TIME">%s</xliff:g>或任何之前的鬧鐘"</string>
     <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>
@@ -2510,7 +2496,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"保持橫向畫面"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持目前方向"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI 資料"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI 相對資料"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"加密"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"繼續"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"您可以在裝置啟動前要求輸入 PIN，以進一步保障這部裝置的安全。裝置在啟動前，將無法接收來電、短訊或通知，包括鬧鐘。\n\n在裝置遺失或被盜時，這個設定有助保障資料安全。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 61612ec..5524786 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -130,7 +130,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"中斷連線？"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"這樣會結束您與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"您沒有變更藍牙設定的權限。"</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"藍牙設定開啟時，附近的裝置可偵測到「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
+    <!-- no translation found for bluetooth_is_visible_message (6222396240776971862) -->
+    <skip />
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"要中斷與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」的連線嗎？"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"廣播"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"停用設定檔？"</string>
@@ -290,7 +291,8 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"管理 Wi-Fi、藍牙、飛航模式、行動網路和 VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"行動數據"</string>
     <string name="calls_title" msgid="3544471959217176768">"來電"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"簡訊"</string>
+    <!-- no translation found for sms_messages_title (1778636286080572535) -->
+    <skip />
     <string name="cellular_data_summary" msgid="4575500999626276446">"允許在行動網路中使用數據服務"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"允許在漫遊時使用數據服務"</string>
     <string name="roaming" msgid="3596055926335478572">"漫遊服務"</string>
@@ -399,6 +401,8 @@
     <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>
+    <!-- no translation found for unlock_disable_frp_warning_content (7070131836291098244) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"已由管理員、加密政策或認證儲存空間停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"無"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"滑動"</string>
@@ -410,6 +414,8 @@
     <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_password_summary" msgid="192161194564577025">"移除解鎖密碼"</string>
+    <!-- no translation found for unlock_disable_lock_unknown_summary (8688498722601653961) -->
+    <skip />
     <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_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
@@ -555,6 +561,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"使用於音樂與媒體"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"記住設定"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"已透過 Wi‑Fi 小幫手連線"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"投放螢幕"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"啟用無線螢幕分享"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"找不到附近的裝置。"</string>
@@ -584,8 +591,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi 設定"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"設定、管理無線網路存取點"</string>
-    <!-- no translation found for wifi_setup_wizard_title (7873622558088429710) -->
-    <skip />
+    <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"選取 Wi-Fi 網路"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"選取 Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"正在開啟 Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"正在關閉 Wi-Fi…"</string>
@@ -600,12 +606,9 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"一律執行掃描"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"一律執行掃描"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"允許 Google 的定位服務和其他應用程式掃描網路 (即使 Wi-Fi 已關閉仍允許掃描)"</string>
-    <!-- no translation found for wifi_automatically_connect_title (7950640291510621742) -->
-    <skip />
-    <!-- no translation found for wifi_automatically_connect_summary (6722194413023965902) -->
-    <skip />
-    <!-- no translation found for wifi_select_assistant_dialog_title (4014645210955009439) -->
-    <skip />
+    <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"自動使用開放 Wi-Fi"</string>
+    <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"允許 Wi‑Fi 小幫手自動連線到系統測定為高品質的開放網路"</string>
+    <string name="wifi_select_assistant_dialog_title" msgid="4014645210955009439">"選擇小幫手"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安裝憑證"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"為了提升定位精確度及用於其他用途，Google 和其他應用程式可能會掃描附近的 Wi-Fi 網路 (即使 Wi-Fi 連線功能已關閉)。如果您不想授予這項權限，可隨時前往 [進階] &gt; [掃描] 變更設定。"</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"應用程式可能會掃描附近的網路 (即使 Wi-Fi 連線功能已關閉)。如果您不想授予這項權限，可隨時前往 [進階] &gt; [掃描] 變更設定。"</string>
@@ -699,12 +702,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"警告：如果略過 Wi-Fi 設定，平板電腦將只能透過行動數據連線進行初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網路。"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"警告：如果略過 Wi-Fi 設定，裝置將只能透過行動數據連線進行初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網路。"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"警告：如果略過 Wi-Fi 設定，手機將只能透過行動數據連線進行初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網路。"</string>
-    <!-- no translation found for wifi_and_mobile_skipped_message (5872240361944591105) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (1013689568018268332) -->
-    <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (5245835374169369770) -->
-    <skip />
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5872240361944591105">"如果您不使用 Wi‑Fi：\n\n您的平板電腦將不會連線至網際網路。\n\n您必須連上網際網路，才能更新軟體。\n\n您目前無法啟用裝置保護功能。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1013689568018268332">"如果您不使用 Wi‑Fi：\n\n您的裝置將不會連線至網際網路。\n\n您必須連上網際網路，才能更新軟體。\n\n您目前無法啟用裝置保護功能。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="5245835374169369770">"如果您不使用 Wi‑Fi：\n\n您的手機將不會連線至網際網路。\n\n您必須連上網際網路，才能更新軟體。\n\n您目前無法啟用裝置保護功能。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"您的平板電腦無法連線至這個 Wi-Fi 網路。"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"裝置無法連線至這個 Wi-Fi 網路。"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"您的手機無法連線至這個 Wi-Fi 網路。"</string>
@@ -1016,8 +1016,7 @@
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"這會清除您手機"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"您目前已登入下列帳戶：\n"</string>
-    <!-- no translation found for master_clear_other_users_present (5161423070702470742) -->
-    <skip />
+    <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"這個裝置上還有其他使用者。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"如要一併清除音樂、圖片及其他用戶資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"如要清除音樂、圖片及其他使用者資料，必須先清除 "<b>"SD 卡"</b>"。"</string>
@@ -1091,12 +1090,9 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"請插入 SIM 卡，並重新啟動裝置"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"請連線至網際網路"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
-    <!-- no translation found for managed_profile_location_category (6992546457880004735) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_title (6712332547063039683) -->
-    <skip />
-    <!-- no translation found for managed_profile_location_switch_lockdown (3851708343340350369) -->
-    <skip />
+    <string name="managed_profile_location_category" msgid="6992546457880004735">"Work 設定檔"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Work 設定檔位置資訊"</string>
+    <string name="managed_profile_location_switch_lockdown" msgid="3851708343340350369">"已經由貴公司關閉"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精確度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"節約耗電量"</string>
@@ -1444,16 +1440,12 @@
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時螢幕不會進入休眠"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"啟用藍牙 HCI 窺探紀錄"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</string>
-    <!-- no translation found for oem_unlock_enable (6040763321967327691) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) -->
-    <skip />
+    <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM 解鎖"</string>
+    <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"允許解除鎖定開機載入器"</string>
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"輸入您的 PIN"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"如要啟用 OEM 解鎖設定，請輸入您的裝置 PIN"</string>
-    <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) -->
-    <skip />
+    <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"要允許 OEM 解鎖嗎？"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告：開啟這項設定時，您將無法使用這個裝置的防盜功能。"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"無線螢幕分享認證"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"啟用 Wi‑Fi 詳細紀錄設定"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi 至行動數據轉換強化"</string>
@@ -1864,10 +1856,8 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"包括應用程式資料"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自動還原功能"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"重新安裝應用程式時，還原備份的設定和資料"</string>
-    <!-- no translation found for backup_inactive_title (5355557151569037197) -->
-    <skip />
-    <!-- no translation found for backup_inactive_summary (7630412094703573180) -->
-    <skip />
+    <string name="backup_inactive_title" msgid="5355557151569037197">"目前無法使用備份服務。"</string>
+    <string name="backup_inactive_summary" msgid="7630412094703573180">"這是由您的裝置政策所設定。"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"電腦備份密碼"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"電腦完整備份目前未受保護"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"輕觸即可變更或移除電腦完整備份的密碼"</string>
@@ -2019,10 +2009,8 @@
     <string name="disable_overlays_summary" msgid="3578941133710758592">"一律使用 GPU 進行畫面合成"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"模擬色彩空間"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"啟用 OpenGL 追蹤"</string>
-    <!-- no translation found for use_awesomeplayer (1583337008516364226) -->
-    <skip />
-    <!-- no translation found for use_awesomeplayer_summary (6757734070733387140) -->
-    <skip />
+    <string name="use_awesomeplayer" msgid="1583337008516364226">"使用 AwesomePlayer (已淘汰)"</string>
+    <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"使用 AwesomePlayer (取代 NuPlayer) 播放大多數媒體"</string>
     <string name="usb_audio_disable_routing" msgid="8114498436003102671">"停用 USB 音訊路由"</string>
     <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"停用 USB 音訊周邊設備的自動路由功能"</string>
     <string name="debug_layout" msgid="5981361776594526155">"顯示版面配置界限"</string>
@@ -2333,8 +2321,7 @@
     <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>
-    <!-- no translation found for sim_name_hint (7038643345238968930) -->
-    <skip />
+    <string name="sim_name_hint" msgid="7038643345238968930">"輸入 SIM 卡名稱"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM 卡插槽 %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"行動通訊業者"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"號碼"</string>
@@ -2344,7 +2331,6 @@
     <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_other_call_settings" msgid="8247802316114482477">"其他通話設定"</string>
@@ -2510,7 +2496,6 @@
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"保持橫向畫面"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持目前方向"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI 資訊"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI 相關資訊"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"加密"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"繼續"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"如果要進一步保護裝置，您可以將裝置設為需要輸入 PIN 才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 552d874..b6927c3 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -130,7 +130,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ungaxhumeki kwi-inthanethi?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Lokhu kuzophelisa uxhumano nge:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1185354873716211496">"Awunayo imvume yokushintsha izilungiselelo ze-Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="3956514990287788968">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> iyabonakala kumadivayisi aseduzane ngenkathi izilungiselelo ze-Bluetooth zivulekile."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> iyabonakala kumadivayisi aseduzane ngenkathi izilungiselelo ze-Bluetooth zivulekile."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Nqamula i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Ukusakaza"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vimbela iphrofayli?"</string>
@@ -290,7 +290,7 @@
     <string name="radio_controls_summary" msgid="2837395036275123133">"Phatha i-Wi‑Fi, Bluetooth, imodi yendiza, amanethiwekhi weselula, nama-VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Idatha yeselula"</string>
     <string name="calls_title" msgid="3544471959217176768">"Amakholi"</string>
-    <string name="sms_messages_title" msgid="3188611825992624879">"Imilayezo ye-SMS"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"Imilayezo ye-SMS"</string>
     <string name="cellular_data_summary" msgid="4575500999626276446">"Vumela ukusetshenziswa kwedatha ngenethiwekhi yeselula"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Vumela ukusetshenziswa kwedatha uma izula"</string>
     <string name="roaming" msgid="3596055926335478572">"Ukuzulazula kwedatha"</string>
@@ -399,6 +399,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Ukuphepha okuphakathi nendawo kuya kokuphezulu"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Iphasiwedi"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Ukuphepha okuphezulu"</string>
+    <string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Izici zokuvikela idivayisi ngeke zisasebenza."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Khubaza umqondisi, ukubethela inqubomgomo, noma isitoreji sobuqinisekisa"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Lutho"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Swayipha"</string>
@@ -410,6 +411,7 @@
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Khipha iphathini yokuvula"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Khipha ukuvala i-PIN"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Khipha iphasiwedi yokuvula"</string>
+    <string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Susa isikrini sokukhiya"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Shintsha iphathini yokuvula"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Shintsha i-PIN yokuvula"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Shintsha iphasiwedi yokuvula"</string>
@@ -555,6 +557,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Komculo nemidiya"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Khumbula izilungiselelo"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Umsizi we-Google Wi‑Fi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Ixhunywe ngomsizi we-Wi-FI"</string>
     <string name="wifi_display_settings_title" msgid="2925465988657380522">"Isikrini sabalingisi"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Nika amandla ukubukeka okungenantambo "</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Awekho amadivayisi aseduze atholakele."</string>
@@ -2327,7 +2330,6 @@
     <string name="color_purple" msgid="3888532466427762504">"Phephuli"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Awekho amakhadi we-SIM afakiwe"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Isimo se-SIM"</string>
-    <string name="sim_status_summary" msgid="4934558018015161369">"Ulwazi oluhlobene ne-SIM"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Shayela emuva kusuka ku-SIM yokuzenzakalelayo"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"I-SIM yamakholi aphumayo"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Ezinye izilungiselelo zekholi"</string>
@@ -2493,7 +2495,6 @@
     <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>
     <string name="imei_information_title" msgid="8499085421609752290">"Ulwazi le-IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Ulwazi oluhlobene lwe-IMEI"</string>
     <string name="encryption_interstitial_header" msgid="5790264941172726485">"Ukubethelwa"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Qhubeka"</string>
     <string name="encryption_interstitial_message_pin" msgid="3705622704667901162">"Ungavikela ngokuthuthukile le divayisi ngokudinga iphasiwedi yakho ngaphambi kokuthi iqale. Ize iqale idivayisi, ayikwazi ukuthola amakholi, imilayezo, noma izaziso kufaka phakathi ama-alamu. \n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma atshontshiwe."</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a5abbbe..70fc4a0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -40,6 +40,12 @@
     <color name="title_color">@android:color/holo_blue_light</color>
     <color name="setup_divider_color_dark">#33ffffff</color>
     <color name="setup_divider_color_light">#33000000</color>
+    <color name="setup_lock_pattern_view_regular_color_dark">#ffbdbdbd</color>
+    <color name="setup_lock_pattern_view_regular_color_light">@color/lock_pattern_view_regular_color</color>
+    <color name="setup_lock_pattern_view_success_color_dark">#ff84ffff</color>
+    <color name="setup_lock_pattern_view_success_color_light">@color/setup_wizard_color_accent_light</color>
+    <color name="setup_lock_pattern_view_error_color_dark">#fff44336</color>
+    <color name="setup_lock_pattern_view_error_color_light">@color/lock_pattern_view_error_color</color>
     <color name="setup_wizard_color_accent_dark">#ff00e4ff</color>
     <color name="setup_wizard_color_accent_light">#ff00828e</color>
     <color name="setup_wizard_wifi_color_dark">#ff00e4ff</color>
diff --git a/res/values/config.xml b/res/values/config.xml
index a6fd34e..f830e06 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -34,4 +34,7 @@
 
     <!-- Carrier_enabled editable -->
     <bool name="config_allow_edit_carrier_enabled" translatable="false">false</bool>
+
+    <!-- The duration (in milliseconds) of activity transitions -->
+    <integer name="setup_wizard_transition_duration">300</integer>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cfb5753..3e115ad 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -270,7 +270,7 @@
     <string name="bluetooth_empty_list_user_restricted">You don\'t have permission to change Bluetooth settings.</string>
 
     <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_is_visible_message"><xliff:g id="device_name">%1$s</xliff:g> is visible to nearby devices while Bluetooth Settings is open.</string>
+    <string name="bluetooth_is_visible_message"><xliff:g id="device_name">%1$s</xliff:g> is visible to nearby devices while Bluetooth settings is open.</string>
     <!-- Bluetooth Visibility discoonect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
     <string name="bluetooth_is_disconnect_question">Disconnect <xliff:g id="device_name">%1$s</xliff:g>?</string>
     <!-- Bluetooth broadcasting settings, option to enable/disable broadcasting -->
@@ -638,7 +638,7 @@
     <!-- check box Calls title [CHAR LIMIT=30] -->
     <string name="calls_title">Calls</string>
     <!-- check box SMS Messges title [CHAR LIMIT=30] -->
-    <string name="sms_messages_title">SMS Messages</string>
+    <string name="sms_messages_title">SMS messages</string>
     <!-- check box cellular data summary [CHAR LIMIT=41] -->
     <string name="cellular_data_summary">Allow data usage over cellular network</string>
     <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->
@@ -958,6 +958,9 @@
     <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_password_summary">High security</string>
 
+    <!--  Content of warning dialog about disabling device protection features when user is switching from a secure unlock method to an insecure one. [CHAR LIMIT=NONE] -->
+    <string name="unlock_disable_frp_warning_content">Device protection features will no longer work.</string>
+
     <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
     <string name="unlock_set_unlock_disabled_summary">Disabled by administrator, encryption policy, or credential storage</string>
 
@@ -983,6 +986,8 @@
     <string name="unlock_disable_lock_pin_summary">Remove unlock PIN</string>
     <!-- Summary shown under unlock_disable_lock_title when password is in use and can be removed [CHAR LIMIT=45]-->
     <string name="unlock_disable_lock_password_summary">Remove unlock password</string>
+    <!-- Summary shown under unlock_disable_lock_title when an unknown secure unlocking method is in use and can be removed [CHAR LIMIT=45]-->
+    <string name="unlock_disable_lock_unknown_summary">Remove screen lock</string>
 
     <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] -->
     <string name="unlock_change_lock_pattern_title">Change unlock pattern</string>
@@ -1321,6 +1326,8 @@
 
     <!-- Wifi Assistant title.  [CHAR LIMIT=40] -->
     <string name="wifi_assistant_title">Wi\u2011Fi Assistant</string>
+    <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+    <string name="connected_via_wfa">Connected via Wi\u2011Fi assistant</string>
 
     <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
     <string name="wifi_display_settings_title">Cast screen</string>
@@ -2106,6 +2113,10 @@
     <string name="sim_change_data_title">Change data SIM?</string>
     <!-- Message confirming the user wishes to change the default data SIM from one to another.  [CHAR LIMIT=NONE] -->
     <string name="sim_change_data_message">Use <xliff:g id="new_sim">%1$s</xliff:g> instead of <xliff:g id="old_sim">%2$s</xliff:g> for cellular data?</string>
+    <!-- Title for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=30] -->
+    <string name="sim_preferred_title">Update preferred SIM card?</string>
+    <!-- Message for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=NONE] -->
+    <string name="sim_preferred_message"><xliff:g id="new_sim">%1$s</xliff:g> is the only SIM in your device.  Do you want to use this SIM for cellular data, calls, and SMS messages?</string>
 
     <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
          Displayed in a dialog box.  [CHAR LIMIT=100] -->
@@ -5538,8 +5549,6 @@
     <string name="sim_no_inserted_msg">No SIM cards inserted</string>
     <!-- SIM status title  [CHAR LIMIT=40] -->
     <string name="sim_status_title">SIM status</string>
-    <!-- SIM status summary [CHAR LIMIT=60] -->
-    <string name="sim_status_summary">SIM related information</string>
     <!-- Title for call back. [CHAR LIMIT=60] -->
     <string name="sim_call_back_title">Call back from default SIM</string>
     <!-- Title for outgoing back. [CHAR LIMIT=60] -->
@@ -5971,8 +5980,6 @@
     <!-- Title and summary for SIM Status -->
     <!-- Title for IMEI preference [CHAR LIMIT=30] -->
     <string name="imei_information_title">IMEI information</string>
-    <!-- Description for IMEI preference [CHAR LIMIT=40] -->
-    <string name="imei_information_summary">IMEI relative information</string>
 
     <!-- Encryption interstitial title [CHAR LIMIT=30] -->
     <string name="encryption_interstitial_header">Encryption</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b4fb388..f7aeb15 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -19,6 +19,7 @@
     <attr name="ic_menu_moreoverflow" format="reference" />
     <attr name="ic_wps" format="reference" />
     <attr name="setup_divider_color" format="reference" />
+    <attr name="side_margin" format="reference|dimension" />
     <attr name="wifi_signal_color" format="reference" />
     <attr name="wifi_signal" format="reference" />
 
@@ -28,11 +29,12 @@
         <item name="android:windowBackground">@null</item>
     </style>
 
-    <style name="SetupWizardWifiTheme" parent="android:Theme.Material.NoActionBar">
+    <style name="SetupWizardTheme" parent="android:Theme.Material.NoActionBar">
         <item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
         <item name="android:colorAccent">@color/setup_wizard_color_accent_dark</item>
         <item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
         <item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item>
+        <item name="android:windowAnimationStyle">@style/Animation.SetupWizard</item>
         <item name="android:windowBackground">?android:attr/colorBackground</item>
         <item name="android:windowSoftInputMode">adjustPan</item>
         <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
@@ -40,16 +42,23 @@
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
         <item name="ic_wps">@drawable/ic_wps_dark</item>
         <item name="setup_divider_color">@color/setup_divider_color_dark</item>
+        <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
         <item name="wifi_signal">@drawable/wifi_signal_teal</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+
+        <!-- LockPatternView colors -->
+        <item name="@*android:regularColor">@color/setup_lock_pattern_view_regular_color_dark</item>
+        <item name="@*android:successColor">@color/setup_lock_pattern_view_success_color_dark</item>
+        <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_dark</item>
     </style>
 
-    <style name="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
+    <style name="SetupWizardTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
         <item name="android:colorAccent">@color/setup_wizard_color_accent_light</item>
         <item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
         <item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item>
+        <item name="android:windowAnimationStyle">@style/Animation.SetupWizard</item>
         <item name="android:windowBackground">?android:attr/colorBackground</item>
         <item name="android:windowSoftInputMode">adjustPan</item>
         <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
@@ -57,9 +66,22 @@
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
         <item name="ic_wps">@drawable/ic_wps_light</item>
         <item name="setup_divider_color">@color/setup_divider_color_light</item>
+        <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
         <item name="wifi_signal">@drawable/wifi_signal_teal</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+
+        <!-- LockPatternView colors -->
+        <item name="@*android:regularColor">@color/setup_lock_pattern_view_regular_color_light</item>
+        <item name="@*android:successColor">@color/setup_lock_pattern_view_success_color_light</item>
+        <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item>
+    </style>
+
+    <style name="Animation.SetupWizard" parent="@android:style/Animation.Activity">
+        <item name="android:activityOpenEnterAnimation">@anim/slide_next_in</item>
+        <item name="android:activityOpenExitAnimation">@anim/slide_next_out</item>
+        <item name="android:activityCloseEnterAnimation">@anim/slide_back_in</item>
+        <item name="android:activityCloseExitAnimation">@anim/slide_back_out</item>
     </style>
 
     <style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">
@@ -98,6 +120,7 @@
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
         <item name="ic_wps">@drawable/ic_wps_dark</item>
         <item name="wifi_signal">@drawable/wifi_signal_teal</item>
+        <item name="side_margin">@dimen/settings_side_margin</item>
 
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index 26b067b..fc6016f 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -29,14 +29,12 @@
         android:persistent="false" />
     <PreferenceScreen android:key="sim_status"
         android:title="@string/sim_status_title"
-        android:summary="@string/sim_status_summary"
         android:persistent="false">
         <intent android:targetPackage="com.android.settings"
             android:targetClass="com.android.settings.deviceinfo.SimStatus" />
     </PreferenceScreen>
     <PreferenceScreen android:key="imei_info"
         android:title="@string/imei_information_title"
-        android:summary="@string/imei_information_summary"
         android:persistent="false">
         <intent android:targetPackage="com.android.settings"
             android:targetClass="com.android.settings.deviceinfo.ImeiInformation" />
diff --git a/res/xml/sim_lock_settings.xml b/res/xml/sim_lock_settings.xml
index 0e43fcd..0246ea2 100644
--- a/res/xml/sim_lock_settings.xml
+++ b/res/xml/sim_lock_settings.xml
@@ -17,8 +17,8 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
         android:title="@string/sim_lock_settings">
-    
-    <CheckBoxPreference
+
+    <SwitchPreference
             android:key="sim_toggle"
             android:title="@string/sim_pin_toggle"
             android:summaryOn="@string/sim_lock_on"
diff --git a/res/xml/sim_settings.xml b/res/xml/sim_settings.xml
index 45d8225..63e4ba4 100644
--- a/res/xml/sim_settings.xml
+++ b/res/xml/sim_settings.xml
@@ -15,13 +15,10 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="sim_cards"
     android:title="@string/sim_settings_title">
 
     <PreferenceCategory
-            android:key="sim_cards"
-            android:title="@string/sim_settings_title" />
-
-    <PreferenceCategory
             android:key="sim_activities"
             android:title="@string/sim_pref_divider" >
 
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index e3a9932..f64a9df 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -18,21 +18,25 @@
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
-import android.app.ActivityManagerNative;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.app.FragmentManager;
 import android.app.PendingIntent;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.UserInfo;
 import android.os.Bundle;
 import android.os.Process;
-import android.os.RemoteException;
-import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.security.KeyStore;
 import android.util.EventLog;
+import android.util.Log;
 import android.util.MutableBoolean;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -50,7 +54,7 @@
     @Override
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
-        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockGenericFragment.class.getName());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getFragmentClass().getName());
         return modIntent;
     }
 
@@ -60,6 +64,10 @@
         return false;
     }
 
+    /* package */ Class<? extends Fragment> getFragmentClass() {
+        return ChooseLockGenericFragment.class;
+    }
+
     public static class InternalActivity extends ChooseLockGeneric {
     }
 
@@ -79,9 +87,11 @@
 
         private static final String WAITING_FOR_CONFIRMATION = "waiting_for_confirmation";
         private static final String FINISH_PENDING = "finish_pending";
+        private static final String TAG = "ChooseLockGenericFragment";
         public static final String MINIMUM_QUALITY_KEY = "minimum_quality";
         public static final String ENCRYPT_REQUESTED_QUALITY = "encrypt_requested_quality";
         public static final String ENCRYPT_REQUESTED_DISABLED = "encrypt_requested_disabled";
+        public static final String TAG_FRP_WARNING_DIALOG = "frp_warning_dialog";
 
         private static final boolean ALWAY_SHOW_TUTORIAL = true;
 
@@ -148,32 +158,15 @@
         public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
                 Preference preference) {
             final String key = preference.getKey();
-            boolean handled = true;
 
-            EventLog.writeEvent(EventLogTags.LOCK_SCREEN_TYPE, key);
-
-            if (KEY_UNLOCK_SET_OFF.equals(key)) {
-                updateUnlockMethodAndFinish(
-                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, true);
-            } else if (KEY_UNLOCK_SET_NONE.equals(key)) {
-                updateUnlockMethodAndFinish(
-                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, false);
-            } else if (KEY_UNLOCK_SET_BIOMETRIC_WEAK.equals(key)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK, false);
-            }else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false);
-            } else if (KEY_UNLOCK_SET_PIN.equals(key)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC, false);
-            } else if (KEY_UNLOCK_SET_PASSWORD.equals(key)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC, false);
+            if (!isUnlockMethodSecure(key) && mLockPatternUtils.isSecure()) {
+                // Show the disabling FRP warning only when the user is switching from a secure
+                // unlock method to an insecure one
+                showFactoryResetProtectionWarningDialog(key);
+                return true;
             } else {
-                handled = false;
+                return setUnlockMethod(key);
             }
-            return handled;
         }
 
         /**
@@ -187,13 +180,13 @@
             if (Process.myUserHandle().isOwner() && LockPatternUtils.isDeviceEncryptionEnabled()) {
                 mEncryptionRequestQuality = quality;
                 mEncryptionRequestDisabled = disabled;
+                final Context context = getActivity();
                 // If accessibility is enabled and the user hasn't seen this dialog before, set the
                 // default state to agree with that which is compatible with accessibility
                 // (password not required).
-                final boolean accEn = AccessibilityManager.getInstance(getActivity()).isEnabled();
+                final boolean accEn = AccessibilityManager.getInstance(context).isEnabled();
                 final boolean required = mLockPatternUtils.isCredentialRequiredToDecrypt(!accEn);
-                Intent intent = EncryptionInterstitial.createStartIntent(
-                        getActivity(), quality, required);
+                Intent intent = getEncryptionInterstitialIntent(context, quality, required);
                 startActivityForResult(intent, ENABLE_ENCRYPTION_REQUEST);
             } else {
                 mRequirePassword = false; // device encryption not enabled or not device owner.
@@ -399,6 +392,24 @@
             return intent;
         }
 
+        protected Intent getLockPasswordIntent(Context context, int quality,
+                final boolean isFallback, int minLength, final int maxLength,
+                boolean requirePasswordToDecrypt, boolean confirmCredentials) {
+            return ChooseLockPassword.createIntent(context, quality, isFallback, minLength,
+                    maxLength, requirePasswordToDecrypt, confirmCredentials);
+        }
+
+        protected Intent getLockPatternIntent(Context context, final boolean isFallback,
+                final boolean requirePassword, final boolean confirmCredentials) {
+            return ChooseLockPattern.createIntent(context, isFallback, requirePassword,
+                    confirmCredentials);
+        }
+
+        protected Intent getEncryptionInterstitialIntent(Context context, int quality,
+                boolean required) {
+            return EncryptionInterstitial.createStartIntent(context, quality, required);
+        }
+
         /**
          * Invokes an activity to change the user's pattern, password or PIN based on given quality
          * and minimum quality specified by DevicePolicyManager. If quality is
@@ -419,14 +430,15 @@
 
             quality = upgradeQuality(quality, null);
 
+            final Context context = getActivity();
             if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
                 int minLength = mDPM.getPasswordMinimumLength(null);
                 if (minLength < MIN_PASSWORD_LENGTH) {
                     minLength = MIN_PASSWORD_LENGTH;
                 }
                 final int maxLength = mDPM.getPasswordMaximumLength(quality);
-                Intent intent = ChooseLockPassword.createIntent(getActivity(), quality, isFallback,
-                        minLength, maxLength, mRequirePassword, false /* confirm credentials */);
+                Intent intent = getLockPasswordIntent(context, quality, isFallback, minLength,
+                        maxLength, mRequirePassword,  /* confirm credentials */false);
                 if (isFallback) {
                     startActivityForResult(intent, FALLBACK_REQUEST);
                     return;
@@ -436,8 +448,8 @@
                     startActivity(intent);
                 }
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
-                Intent intent = ChooseLockPattern.createIntent(getActivity(),
-                        isFallback, mRequirePassword, false /* confirm credentials */);
+                Intent intent = getLockPatternIntent(context, isFallback, mRequirePassword,
+                        /* confirm credentials */false);
                 if (isFallback) {
                     startActivityForResult(intent, FALLBACK_REQUEST);
                     return;
@@ -465,5 +477,113 @@
             return R.string.help_url_choose_lockscreen;
         }
 
+        private int getResIdForFactoryResetProtectionWarningTitle() {
+            switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) {
+                case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+                    return R.string.unlock_disable_lock_pattern_summary;
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+                    return R.string.unlock_disable_lock_pin_summary;
+                case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+                    return R.string.unlock_disable_lock_password_summary;
+                default:
+                    return R.string.unlock_disable_lock_unknown_summary;
+            }
+        }
+
+        private boolean isUnlockMethodSecure(String unlockMethod) {
+            return !(KEY_UNLOCK_SET_OFF.equals(unlockMethod) ||
+                    KEY_UNLOCK_SET_NONE.equals(unlockMethod));
+        }
+
+        private boolean setUnlockMethod(String unlockMethod) {
+            EventLog.writeEvent(EventLogTags.LOCK_SCREEN_TYPE, unlockMethod);
+
+            if (KEY_UNLOCK_SET_OFF.equals(unlockMethod)) {
+                updateUnlockMethodAndFinish(
+                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, true /* disabled */ );
+            } else if (KEY_UNLOCK_SET_NONE.equals(unlockMethod)) {
+                updateUnlockMethodAndFinish(
+                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, false /* disabled */ );
+            } else if (KEY_UNLOCK_SET_BIOMETRIC_WEAK.equals(unlockMethod)) {
+                maybeEnableEncryption(
+                        DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK, false);
+            } else if (KEY_UNLOCK_SET_PATTERN.equals(unlockMethod)) {
+                maybeEnableEncryption(
+                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false);
+            } else if (KEY_UNLOCK_SET_PIN.equals(unlockMethod)) {
+                maybeEnableEncryption(
+                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC, false);
+            } else if (KEY_UNLOCK_SET_PASSWORD.equals(unlockMethod)) {
+                maybeEnableEncryption(
+                        DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC, false);
+            } else {
+                Log.e(TAG, "Encountered unknown unlock method to set: " + unlockMethod);
+                return false;
+            }
+            return true;
+        }
+
+        private void showFactoryResetProtectionWarningDialog(String unlockMethodToSet) {
+            int title = getResIdForFactoryResetProtectionWarningTitle();
+            FactoryResetProtectionWarningDialog dialog =
+                    FactoryResetProtectionWarningDialog.newInstance(title, unlockMethodToSet);
+            dialog.show(getChildFragmentManager(), TAG_FRP_WARNING_DIALOG);
+        }
+
+        public static class FactoryResetProtectionWarningDialog extends DialogFragment {
+
+            private static final String ARG_TITLE_RES = "titleRes";
+            private static final String ARG_UNLOCK_METHOD_TO_SET = "unlockMethodToSet";
+
+            public static FactoryResetProtectionWarningDialog newInstance(int title,
+                    String unlockMethodToSet) {
+                FactoryResetProtectionWarningDialog frag =
+                        new FactoryResetProtectionWarningDialog();
+                Bundle args = new Bundle();
+                args.putInt(ARG_TITLE_RES, title);
+                args.putString(ARG_UNLOCK_METHOD_TO_SET, unlockMethodToSet);
+                frag.setArguments(args);
+                return frag;
+            }
+
+            @Override
+            public void show(FragmentManager manager, String tag) {
+                if (manager.findFragmentByTag(tag) == null) {
+                    // Prevent opening multiple dialogs if tapped on button quickly
+                    super.show(manager, tag);
+                }
+            }
+
+            @Override
+            public Dialog onCreateDialog(Bundle savedInstanceState) {
+                final Bundle args = getArguments();
+
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(args.getInt(ARG_TITLE_RES))
+                        .setMessage(R.string.unlock_disable_frp_warning_content)
+                        .setPositiveButton(R.string.okay,
+                                new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int whichButton) {
+                                        ((ChooseLockGenericFragment) getParentFragment())
+                                                .setUnlockMethod(
+                                                        args.getString(ARG_UNLOCK_METHOD_TO_SET));
+                                    }
+                                }
+                        )
+                        .setNegativeButton(R.string.cancel,
+                                new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int whichButton) {
+                                        dismiss();
+                                    }
+                                }
+                        )
+                        .create();
+            }
+        }
     }
 }
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 861930a..fa1c678 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -24,14 +24,12 @@
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.inputmethodservice.KeyboardView;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.provider.Settings;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Selection;
@@ -61,7 +59,7 @@
     @Override
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
-        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockPasswordFragment.class.getName());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getFragmentClass().getName());
         return modIntent;
     }
 
@@ -84,6 +82,10 @@
         return false;
     }
 
+    /* package */ Class<? extends Fragment> getFragmentClass() {
+        return ChooseLockPasswordFragment.class;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         // TODO: Fix on phones
@@ -200,8 +202,12 @@
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
+            return inflater.inflate(R.layout.choose_lock_password, container, false);
+        }
 
-            View view = inflater.inflate(R.layout.choose_lock_password, null);
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
 
             mCancelButton = (Button) view.findViewById(R.id.cancel_button);
             mCancelButton.setOnClickListener(this);
@@ -254,8 +260,6 @@
                 CharSequence title = getText(id);
                 sa.setTitle(title);
             }
-
-            return view;
         }
 
         @Override
@@ -293,6 +297,10 @@
             }
         }
 
+        protected Intent getRedactionInterstitialIntent(Context context) {
+            return RedactionInterstitial.createStartIntent(context);
+        }
+
         protected void updateStage(Stage stage) {
             final Stage previousStage = mUiStage;
             mUiStage = stage;
@@ -406,7 +414,7 @@
             return null;
         }
 
-        private void handleNext() {
+        public void handleNext() {
             if (mDone) return;
 
             final String pin = mPasswordEntry.getText().toString();
@@ -435,7 +443,7 @@
                     getActivity().finish();
                     mDone = true;
                     if (!wasSecureBefore) {
-                        startActivity(RedactionInterstitial.createStartIntent(getActivity()));
+                        startActivity(getRedactionInterstitialIntent(getActivity()));
                     }
                 } else {
                     CharSequence tmp = mPasswordEntry.getText();
@@ -450,6 +458,14 @@
             }
         }
 
+        protected void setNextEnabled(boolean enabled) {
+            mNextButton.setEnabled(enabled);
+        }
+
+        protected void setNextText(int text) {
+            mNextButton.setText(text);
+        }
+
         public void onClick(View v) {
             switch (v.getId()) {
                 case R.id.next_button:
@@ -492,22 +508,22 @@
                     String msg = getString(mIsAlphaMode ? R.string.lockpassword_password_too_short
                             : R.string.lockpassword_pin_too_short, mPasswordMinLength);
                     mHeaderText.setText(msg);
-                    mNextButton.setEnabled(false);
+                    setNextEnabled(false);
                 } else {
                     String error = validatePassword(password);
                     if (error != null) {
                         mHeaderText.setText(error);
-                        mNextButton.setEnabled(false);
+                        setNextEnabled(false);
                     } else {
                         mHeaderText.setText(R.string.lockpassword_press_continue);
-                        mNextButton.setEnabled(true);
+                        setNextEnabled(true);
                     }
                 }
             } else {
                 mHeaderText.setText(mIsAlphaMode ? mUiStage.alphaHint : mUiStage.numericHint);
-                mNextButton.setEnabled(length > 0);
+                setNextEnabled(length > 0);
             }
-            mNextButton.setText(mUiStage.buttonText);
+            setNextText(mUiStage.buttonText);
         }
 
         public void afterTextChanged(Editable s) {
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 2c3beef..e454ed1 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -65,7 +65,7 @@
     @Override
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
-        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockPatternFragment.class.getName());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getFragmentClass().getName());
         return modIntent;
     }
 
@@ -85,6 +85,10 @@
         return false;
     }
 
+    /* package */ Class<? extends Fragment> getFragmentClass() {
+        return ChooseLockPatternFragment.class;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         // requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -146,6 +150,14 @@
             }
         }
 
+        protected void setRightButtonEnabled(boolean enabled) {
+            mFooterRightButton.setEnabled(enabled);
+        }
+
+        protected void setRightButtonText(int text) {
+            mFooterRightButton.setText(text);
+        }
+
         /**
          * The pattern listener that responds according to a user choosing a new
          * lock pattern.
@@ -327,9 +339,12 @@
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
+            return inflater.inflate(R.layout.choose_lock_pattern, container, false);
+        }
 
-            // setupViews()
-            View view = inflater.inflate(R.layout.choose_lock_pattern, null);
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
             mHeaderText = (TextView) view.findViewById(R.id.headerText);
             mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
             mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);
@@ -377,46 +392,57 @@
                 updateStage(Stage.values()[savedInstanceState.getInt(KEY_UI_STAGE)]);
             }
             mDone = false;
-            return view;
+        }
+
+        protected Intent getRedactionInterstitialIntent(Context context) {
+            return RedactionInterstitial.createStartIntent(context);
+        }
+
+        public void handleLeftButton() {
+            if (mUiStage.leftMode == LeftButtonMode.Retry) {
+                mChosenPattern = null;
+                mLockPatternView.clearPattern();
+                updateStage(Stage.Introduction);
+            } else if (mUiStage.leftMode == LeftButtonMode.Cancel) {
+                // They are canceling the entire wizard
+                getActivity().setResult(RESULT_FINISHED);
+                getActivity().finish();
+            } else {
+                throw new IllegalStateException("left footer button pressed, but stage of " +
+                        mUiStage + " doesn't make sense");
+            }
+        }
+
+        public void handleRightButton() {
+            if (mUiStage.rightMode == RightButtonMode.Continue) {
+                if (mUiStage != Stage.FirstChoiceValid) {
+                    throw new IllegalStateException("expected ui stage "
+                            + Stage.FirstChoiceValid + " when button is "
+                            + RightButtonMode.Continue);
+                }
+                updateStage(Stage.NeedToConfirm);
+            } else if (mUiStage.rightMode == RightButtonMode.Confirm) {
+                if (mUiStage != Stage.ChoiceConfirmed) {
+                    throw new IllegalStateException("expected ui stage " + Stage.ChoiceConfirmed
+                            + " when button is " + RightButtonMode.Confirm);
+                }
+                saveChosenPatternAndFinish();
+            } else if (mUiStage.rightMode == RightButtonMode.Ok) {
+                if (mUiStage != Stage.HelpScreen) {
+                    throw new IllegalStateException("Help screen is only mode with ok button, "
+                            + "but stage is " + mUiStage);
+                }
+                mLockPatternView.clearPattern();
+                mLockPatternView.setDisplayMode(DisplayMode.Correct);
+                updateStage(Stage.Introduction);
+            }
         }
 
         public void onClick(View v) {
             if (v == mFooterLeftButton) {
-                if (mUiStage.leftMode == LeftButtonMode.Retry) {
-                    mChosenPattern = null;
-                    mLockPatternView.clearPattern();
-                    updateStage(Stage.Introduction);
-                } else if (mUiStage.leftMode == LeftButtonMode.Cancel) {
-                    // They are canceling the entire wizard
-                    getActivity().setResult(RESULT_FINISHED);
-                    getActivity().finish();
-                } else {
-                    throw new IllegalStateException("left footer button pressed, but stage of " +
-                        mUiStage + " doesn't make sense");
-                }
+                handleLeftButton();
             } else if (v == mFooterRightButton) {
-
-                if (mUiStage.rightMode == RightButtonMode.Continue) {
-                    if (mUiStage != Stage.FirstChoiceValid) {
-                        throw new IllegalStateException("expected ui stage " + Stage.FirstChoiceValid
-                                + " when button is " + RightButtonMode.Continue);
-                    }
-                    updateStage(Stage.NeedToConfirm);
-                } else if (mUiStage.rightMode == RightButtonMode.Confirm) {
-                    if (mUiStage != Stage.ChoiceConfirmed) {
-                        throw new IllegalStateException("expected ui stage " + Stage.ChoiceConfirmed
-                                + " when button is " + RightButtonMode.Confirm);
-                    }
-                    saveChosenPatternAndFinish();
-                } else if (mUiStage.rightMode == RightButtonMode.Ok) {
-                    if (mUiStage != Stage.HelpScreen) {
-                        throw new IllegalStateException("Help screen is only mode with ok button, but " +
-                                "stage is " + mUiStage);
-                    }
-                    mLockPatternView.clearPattern();
-                    mLockPatternView.setDisplayMode(DisplayMode.Correct);
-                    updateStage(Stage.Introduction);
-                }
+                handleRightButton();
             }
         }
 
@@ -479,8 +505,8 @@
                 mFooterLeftButton.setEnabled(stage.leftMode.enabled);
             }
 
-            mFooterRightButton.setText(stage.rightMode.text);
-            mFooterRightButton.setEnabled(stage.rightMode.enabled);
+            setRightButtonText(stage.rightMode.text);
+            setRightButtonEnabled(stage.rightMode.enabled);
 
             // same for whether the patten is enabled
             if (stage.patternEnabled) {
@@ -545,8 +571,8 @@
             final boolean required = getActivity().getIntent().getBooleanExtra(
                     EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
             utils.setCredentialRequiredToDecrypt(required);
-            utils.saveLockPattern(mChosenPattern, isFallback);
             utils.setLockPatternEnabled(true);
+            utils.saveLockPattern(mChosenPattern, isFallback);
 
             if (lockVirgin) {
                 utils.setVisiblePatternEnabled(true);
@@ -556,7 +582,7 @@
             getActivity().finish();
             mDone = true;
             if (!wasSecureBefore) {
-                startActivity(RedactionInterstitial.createStartIntent(getActivity()));
+                startActivity(getRedactionInterstitialIntent(getActivity()));
             }
         }
     }
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index a0a237d..1c17ce5 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -140,6 +140,7 @@
 import com.android.settings.sim.SimSettings;
 import com.android.settings.widget.ChartDataUsageView;
 import com.android.settings.widget.ChartDataUsageView.DataUsageChartListener;
+import com.android.settings.widget.ChartNetworkSeriesView;
 import com.google.android.collect.Lists;
 
 import libcore.util.Objects;
@@ -209,6 +210,8 @@
     private ViewGroup mTabsContainer;
     private TabWidget mTabWidget;
     private ListView mListView;
+    private ChartNetworkSeriesView mSeries;
+    private ChartNetworkSeriesView mDetailedSeries;
     private DataUsageAdapter mAdapter;
 
     /** Distance to inset content from sides, when needed. */
@@ -400,6 +403,8 @@
             mCycleSpinner.setOnItemSelectedListener(mCycleListener);
             mCycleSummary = (TextView) mCycleView.findViewById(R.id.cycle_summary);
             mNetworkSwitches.addView(mCycleView);
+            mSeries = (ChartNetworkSeriesView)view.findViewById(R.id.series);
+            mDetailedSeries = (ChartNetworkSeriesView)view.findViewById(R.id.detail_series);
         }
 
         mChart = (ChartDataUsageView) mHeader.findViewById(R.id.chart);
@@ -658,16 +663,17 @@
         final Context context = getActivity();
         mTabHost.clearAllTabs();
 
-        final boolean mobileSplit = isMobilePolicySplit();
-        if (mobileSplit && hasReadyMobile4gRadio(context)) {
-            mTabHost.addTab(buildTabSpec(TAB_3G, R.string.data_usage_tab_3g));
-            mTabHost.addTab(buildTabSpec(TAB_4G, R.string.data_usage_tab_4g));
-        } else if (hasReadyMobileRadio(context)) {
-            addMobileTab(context, mSubInfoList);
+        for (int i = 0; i < mTelephonyManager.getSimCount(); i++) {
+            final SubscriptionInfo sir = Utils.findRecordBySlotId(context, i);
+            if (sir != null) {
+                addMobileTab(context, sir);
+            }
         }
+
         if (mShowWifi && hasWifiRadio(context)) {
             mTabHost.addTab(buildTabSpec(TAB_WIFI, R.string.data_usage_tab_wifi));
         }
+
         if (mShowEthernet && hasEthernet(context)) {
             mTabHost.addTab(buildTabSpec(TAB_ETHERNET, R.string.data_usage_tab_ethernet));
         }
@@ -736,6 +742,7 @@
         if (!isAdded()) return;
 
         final Context context = getActivity();
+        final Resources resources = context.getResources();
         final String currentTab = mTabHost.getCurrentTabTag();
         final boolean isOwner = ActivityManager.getCurrentUser() == UserHandle.USER_OWNER;
 
@@ -754,20 +761,25 @@
         mDataEnabledSupported = isOwner;
         mDisableAtLimitSupported = true;
 
-        // TODO: remove mobile tabs when SIM isn't ready
+        // TODO: remove mobile tabs when SIM isn't ready probably by
+        // TODO: using SubscriptionManager.getActiveSubscriptionInfoList.
+        if (LOGD) Log.d(TAG, "updateBody() isMobileTab=" + isMobileTab(currentTab));
 
         if (isMobileTab(currentTab)) {
+            if (LOGD) Log.d(TAG, "updateBody() mobile tab");
             setPreferenceTitle(mDataEnabledView, R.string.data_usage_enable_mobile);
             setPreferenceTitle(mDisableAtLimitView, R.string.data_usage_disable_mobile_limit);
             mTemplate = buildTemplateMobileAll(getActiveSubscriberId(context,getSubId(currentTab)));
             mDataEnabledSupported = isMobileDataAvailable(getSubId(currentTab));
         } else if (TAB_3G.equals(currentTab)) {
+            if (LOGD) Log.d(TAG, "updateBody() 3g tab");
             setPreferenceTitle(mDataEnabledView, R.string.data_usage_enable_3g);
             setPreferenceTitle(mDisableAtLimitView, R.string.data_usage_disable_3g_limit);
             // TODO: bind mDataEnabled to 3G radio state
             mTemplate = buildTemplateMobile3gLower(getActiveSubscriberId(context));
 
         } else if (TAB_4G.equals(currentTab)) {
+            if (LOGD) Log.d(TAG, "updateBody() 4g tab");
             setPreferenceTitle(mDataEnabledView, R.string.data_usage_enable_4g);
             setPreferenceTitle(mDisableAtLimitView, R.string.data_usage_disable_4g_limit);
             // TODO: bind mDataEnabled to 4G radio state
@@ -775,17 +787,20 @@
 
         } else if (TAB_WIFI.equals(currentTab)) {
             // wifi doesn't have any controls
+            if (LOGD) Log.d(TAG, "updateBody() wifi tab");
             mDataEnabledSupported = false;
             mDisableAtLimitSupported = false;
             mTemplate = buildTemplateWifiWildcard();
 
         } else if (TAB_ETHERNET.equals(currentTab)) {
             // ethernet doesn't have any controls
+            if (LOGD) Log.d(TAG, "updateBody() ethernet tab");
             mDataEnabledSupported = false;
             mDisableAtLimitSupported = false;
             mTemplate = buildTemplateEthernet();
 
         } else {
+            if (LOGD) Log.d(TAG, "updateBody() unknown tab");
             throw new IllegalStateException("unknown tab: " + currentTab);
         }
 
@@ -799,6 +814,21 @@
         getActivity().invalidateOptionsMenu();
 
         mBinding = false;
+
+        int seriesColor = resources.getColor(R.color.sim_noitification);
+        if (mCurrentTab != null && mCurrentTab.length() > TAB_MOBILE.length() ){
+            final int slotId = Integer.parseInt(mCurrentTab.substring(TAB_MOBILE.length(),
+                    mCurrentTab.length()));
+            final SubscriptionInfo sir = com.android.settings.Utils.findRecordBySlotId(context,
+                    slotId);
+
+            if (sir != null) {
+                seriesColor = sir.getIconTint();
+            }
+        }
+
+        mSeries.setChartColor(Color.BLACK, seriesColor, seriesColor);
+        mDetailedSeries.setChartColor(Color.BLACK, seriesColor, seriesColor);
     }
 
     private boolean isAppDetailMode() {
@@ -1367,12 +1397,15 @@
     @Deprecated
     private boolean isMobilePolicySplit() {
         final Context context = getActivity();
+        boolean retVal;
         if (hasReadyMobileRadio(context)) {
             final TelephonyManager tele = TelephonyManager.from(context);
-            return mPolicyEditor.isMobilePolicySplit(getActiveSubscriberId(context));
+            retVal = mPolicyEditor.isMobilePolicySplit(getActiveSubscriberId(context));
         } else {
-            return false;
+            retVal = false;
         }
+        if (LOGD) Log.d(TAG, "isMobilePolicySplit: retVal=" + retVal);
+        return retVal;
     }
 
     @Deprecated
@@ -1380,6 +1413,7 @@
         final Context context = getActivity();
         if (hasReadyMobileRadio(context)) {
             final TelephonyManager tele = TelephonyManager.from(context);
+            if (LOGD) Log.d(TAG, "setMobilePolicySplit: split=" + split);
             mPolicyEditor.setMobilePolicySplit(getActiveSubscriberId(context), split);
         }
     }
@@ -1387,12 +1421,16 @@
     private static String getActiveSubscriberId(Context context) {
         final TelephonyManager tele = TelephonyManager.from(context);
         final String actualSubscriberId = tele.getSubscriberId();
-        return SystemProperties.get(TEST_SUBSCRIBER_PROP, actualSubscriberId);
+        String retVal = SystemProperties.get(TEST_SUBSCRIBER_PROP, actualSubscriberId);
+        if (LOGD) Log.d(TAG, "getActiveSubscriberId=" + retVal + " actualSubscriberId=" + actualSubscriberId);
+        return retVal;
     }
 
     private static String getActiveSubscriberId(Context context, int subId) {
         final TelephonyManager tele = TelephonyManager.from(context);
-        return tele.getSubscriberId(subId);
+        String retVal = tele.getSubscriberId(subId);
+        if (LOGD) Log.d(TAG, "getActiveSubscriberId=" + retVal + " subId=" + subId);
+        return retVal;
     }
 
     private DataUsageChartListener mChartListener = new DataUsageChartListener() {
@@ -2345,14 +2383,23 @@
                 SubscriptionManager.from(context).getActiveSubscriptionInfoList();
         // No activated Subscriptions
         if (subInfoList == null) {
+            if (LOGD) Log.d(TAG, "hasReadyMobileRadio: subInfoList=null");
             return false;
         }
         // require both supported network and ready SIM
         boolean isReady = true;
         for (SubscriptionInfo subInfo : subInfoList) {
             isReady = isReady & tele.getSimState(subInfo.getSimSlotIndex()) == SIM_STATE_READY;
+            if (LOGD) Log.d(TAG, "hasReadyMobileRadio: subInfo=" + subInfo);
         }
-        return conn.isNetworkSupported(TYPE_MOBILE) && isReady;
+        boolean retVal = conn.isNetworkSupported(TYPE_MOBILE) && isReady;
+        if (LOGD) {
+            Log.d(TAG, "hasReadyMobileRadio:"
+                    + " conn.isNetworkSupported(TYPE_MOBILE)="
+                                            + conn.isNetworkSupported(TYPE_MOBILE)
+                    + " isReady=" + isReady);
+        }
+        return retVal;
     }
 
     /*
@@ -2368,7 +2415,11 @@
         final int slotId = SubscriptionManager.getSlotId(subId);
         final boolean isReady = tele.getSimState(slotId) == SIM_STATE_READY;
 
-        return conn.isNetworkSupported(TYPE_MOBILE) && isReady;
+        boolean retVal =  conn.isNetworkSupported(TYPE_MOBILE) && isReady;
+        if (LOGD) Log.d(TAG, "hasReadyMobileRadio: subId=" + subId
+                + " conn.isNetworkSupported(TYPE_MOBILE)=" + conn.isNetworkSupported(TYPE_MOBILE)
+                + " isReady=" + isReady);
+        return retVal;
     }
 
     /**
@@ -2588,14 +2639,14 @@
             }
         };
 
-        private void addMobileTab(Context context, List<SubscriptionInfo> subInfoList) {
-            if (subInfoList != null && mMobileTagMap != null) {
-                for (SubscriptionInfo subInfo : mSubInfoList) {
-                    if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
-                        mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
-                                subInfo.getDisplayName()));
-                    }
+        private void addMobileTab(Context context, SubscriptionInfo subInfo) {
+            if (subInfo != null && mMobileTagMap != null) {
+                if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
+                    mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
+                            subInfo.getDisplayName()));
                 }
+            } else {
+                if (LOGD) Log.d(TAG, "addMobileTab: subInfoList is null");
             }
         }
 
diff --git a/src/com/android/settings/EnableWifiTether.java b/src/com/android/settings/EnableWifiTether.java
new file mode 100644
index 0000000..a67250d
--- /dev/null
+++ b/src/com/android/settings/EnableWifiTether.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2008 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;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.SystemProperties;
+import android.util.Log;
+import android.provider.Settings;
+
+public class EnableWifiTether extends Activity {
+
+    private static final String TETHER_CHOICE = "TETHER_TYPE";
+    private String[] mProvisionApp;
+    private static final int PROVISION_REQUEST = 0;
+    private static final int WIFI_TETHERING = 0;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        mProvisionApp = getResources().getStringArray(
+                com.android.internal.R.array.config_mobile_hotspot_provision_app);
+        setContentView(R.layout.settings_main_dashboard);
+        startProvisioningIfNecessary();
+    }
+
+    private static boolean isProvisioningNeeded(String[] provisionApp) {
+        if (SystemProperties.getBoolean("net.tethering.noprovisioning", false)
+                || provisionApp == null) {
+            return false;
+        }
+        return (provisionApp.length == 2);
+    }
+
+    private void startProvisioningIfNecessary() {
+
+        if (isProvisioningNeeded(mProvisionApp)) {
+            Intent closeDialog = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
+            sendBroadcast(closeDialog);
+            Intent intent = new Intent(Intent.ACTION_MAIN);
+            intent.setClassName(mProvisionApp[0], mProvisionApp[1]);
+            intent.putExtra(TETHER_CHOICE, WIFI_TETHERING);
+            startActivityForResult(intent, PROVISION_REQUEST);
+        } else {
+            enableTethering();
+            finish();
+        }
+    }
+
+    public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+
+        if (requestCode == PROVISION_REQUEST) {
+            if (resultCode == Activity.RESULT_OK) {
+                enableTethering();
+            }
+        }
+        finish();
+    }
+
+    private void enableTethering() {
+        final ContentResolver cr = getContentResolver();
+        WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        int wifiState = wifiManager.getWifiState();
+
+        if ((wifiState == WifiManager.WIFI_STATE_ENABLING) ||
+                (wifiState == WifiManager.WIFI_STATE_ENABLED)) {
+            wifiManager.setWifiEnabled(false);
+            Settings.Global.putInt(cr, Settings.Global.WIFI_SAVED_STATE, 1);
+        }
+
+        wifiManager.setWifiApEnabled(null, true);
+    }
+
+}
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index cfe27bb..5201375 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -25,10 +25,10 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -106,7 +106,7 @@
     private Phone mPhone;
 
     private EditPinPreference mPinDialog;
-    private CheckBoxPreference mPinToggle;
+    private SwitchPreference mPinToggle;
 
     private Resources mRes;
 
@@ -173,7 +173,7 @@
         addPreferencesFromResource(R.xml.sim_lock_settings);
 
         mPinDialog = (EditPinPreference) findPreference(PIN_DIALOG);
-        mPinToggle = (CheckBoxPreference) findPreference(PIN_TOGGLE);
+        mPinToggle = (SwitchPreference) findPreference(PIN_TOGGLE);
         if (savedInstanceState != null && savedInstanceState.containsKey(DIALOG_STATE)) {
             mDialogState = savedInstanceState.getInt(DIALOG_STATE);
             mPin = savedInstanceState.getString(DIALOG_PIN);
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index aba2c3d5..2b086a6 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -232,7 +232,8 @@
                 Drawable icon = null;
                 try {
                     if (desc.iconId != 0) {
-                        Context authContext = context.createPackageContext(desc.packageName, 0);
+                        Context authContext = context.createPackageContextAsUser(desc.packageName,
+                                0, userHandle);
                         icon = context.getPackageManager().getUserBadgedIcon(
                                 authContext.getDrawable(desc.iconId), userHandle);
                     }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 37fcc87..dc5675c 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -184,6 +184,11 @@
      * that fragment.
      */
     public static final String EXTRA_SHOW_FRAGMENT_TITLE = ":settings:show_fragment_title";
+    /**
+     * The package name used to resolve the title resource id.
+     */
+    public static final String EXTRA_SHOW_FRAGMENT_TITLE_RES_PACKAGE_NAME =
+            ":settings:show_fragment_title_res_package_name";
     public static final String EXTRA_SHOW_FRAGMENT_TITLE_RESID =
             ":settings:show_fragment_title_resid";
     public static final String EXTRA_SHOW_FRAGMENT_AS_SHORTCUT =
@@ -657,7 +662,23 @@
         if (initialTitleResId > 0) {
             mInitialTitle = null;
             mInitialTitleResId = initialTitleResId;
-            setTitle(mInitialTitleResId);
+
+            final String initialTitleResPackageName = intent.getStringExtra(
+                    EXTRA_SHOW_FRAGMENT_TITLE_RES_PACKAGE_NAME);
+            if (initialTitleResPackageName != null) {
+                try {
+                    Context authContext = createPackageContextAsUser(initialTitleResPackageName,
+                            0 /* flags */, new UserHandle(UserHandle.myUserId()));
+                    mInitialTitle = authContext.getResources().getText(mInitialTitleResId);
+                    setTitle(mInitialTitle);
+                    mInitialTitleResId = -1;
+                    return;
+                } catch (NameNotFoundException e) {
+                    Log.w(LOG_TAG, "Could not find package" + initialTitleResPackageName);
+                }
+            } else {
+                setTitle(mInitialTitleResId);
+            }
         } else {
             mInitialTitleResId = -1;
             final String initialTitle = intent.getStringExtra(EXTRA_SHOW_FRAGMENT_TITLE);
diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java
new file mode 100644
index 0000000..c40e7c1a
--- /dev/null
+++ b/src/com/android/settings/SetupChooseLockGeneric.java
@@ -0,0 +1,123 @@
+/*
+ * 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.
+ */
+
+package com.android.settings;
+
+import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+
+/**
+ * Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure
+ * from ChooseLockGeneric class, and should remain similar to that behaviorally. This class should
+ * only overload base methods for minor theme and behavior differences specific to Setup Wizard.
+ * Other changes should be done to ChooseLockGeneric class instead and let this class inherit
+ * those changes.
+ */
+public class SetupChooseLockGeneric extends ChooseLockGeneric
+        implements SetupWizardNavBar.NavigationBarListener {
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return SetupChooseLockGenericFragment.class.getName().equals(fragmentName);
+    }
+
+    @Override
+    /* package */ Class<? extends PreferenceFragment> getFragmentClass() {
+        return SetupChooseLockGenericFragment.class;
+    }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
+    @Override
+    public void onNavigationBarCreated(SetupWizardNavBar bar) {
+        SetupWizardUtils.setImmersiveMode(this, bar);
+        bar.getNextButton().setEnabled(false);
+    }
+
+    @Override
+    public void onNavigateBack() {
+        onBackPressed();
+    }
+
+    @Override
+    public void onNavigateNext() {
+    }
+
+    public static class SetupChooseLockGenericFragment extends ChooseLockGenericFragment {
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            final View view = inflater.inflate(R.layout.setup_preference, container, false);
+            ListView list = (ListView) view.findViewById(android.R.id.list);
+            View title = view.findViewById(R.id.title);
+            if (title == null) {
+                final View header = inflater.inflate(R.layout.setup_wizard_header, list, false);
+                list.addHeaderView(header, null, false);
+            }
+            return view;
+        }
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            SetupWizardUtils.setIllustration(getActivity(),
+                    R.drawable.setup_illustration_lock_screen);
+            SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle());
+        }
+
+        @Override
+        protected Intent getLockPasswordIntent(Context context, int quality, boolean isFallback,
+                int minLength, int maxLength, boolean requirePasswordToDecrypt,
+                boolean confirmCredentials) {
+            final Intent intent = SetupChooseLockPassword.createIntent(context, quality,
+                    isFallback, minLength, maxLength, requirePasswordToDecrypt, confirmCredentials);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        protected Intent getLockPatternIntent(Context context, boolean isFallback,
+                boolean requirePassword, boolean confirmCredentials) {
+            final Intent intent = SetupChooseLockPattern.createIntent(context, isFallback,
+                    requirePassword, confirmCredentials);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        protected Intent getEncryptionInterstitialIntent(Context context, int quality,
+                boolean required) {
+            Intent intent = SetupEncryptionInterstitial.createStartIntent(context, quality,
+                    required);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+    }
+}
diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java
new file mode 100644
index 0000000..0c7e57f
--- /dev/null
+++ b/src/com/android/settings/SetupChooseLockPassword.java
@@ -0,0 +1,133 @@
+/*
+ * 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.
+ */
+
+package com.android.settings;
+
+import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure
+ * from ChooseLockPassword class, and should remain similar to that behaviorally. This class should
+ * only overload base methods for minor theme and behavior differences specific to Setup Wizard.
+ * Other changes should be done to ChooseLockPassword class instead and let this class inherit
+ * those changes.
+ */
+public class SetupChooseLockPassword extends ChooseLockPassword
+        implements SetupWizardNavBar.NavigationBarListener {
+
+    public static Intent createIntent(Context context, int quality, final boolean isFallback,
+            int minLength, final int maxLength, boolean requirePasswordToDecrypt,
+            boolean confirmCredentials) {
+        Intent intent = ChooseLockPassword.createIntent(context, quality, isFallback, minLength,
+                maxLength, requirePasswordToDecrypt, confirmCredentials);
+        intent.setClass(context, SetupChooseLockPassword.class);
+        intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
+        return intent;
+    }
+
+    private SetupWizardNavBar mNavigationBar;
+    private SetupChooseLockPasswordFragment mFragment;
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return SetupChooseLockPasswordFragment.class.getName().equals(fragmentName);
+    }
+
+    @Override
+    /* package */ Class<? extends Fragment> getFragmentClass() {
+        return SetupChooseLockPasswordFragment.class;
+    }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
+    @Override
+    public void onNavigationBarCreated(SetupWizardNavBar bar) {
+        mNavigationBar = bar;
+        SetupWizardUtils.setImmersiveMode(this, bar);
+    }
+
+    @Override
+    public void onNavigateBack() {
+        onBackPressed();
+    }
+
+    @Override
+    public void onNavigateNext() {
+        if (mFragment != null) {
+            mFragment.handleNext();
+        }
+    }
+
+    @Override
+    public void onAttachFragment(Fragment fragment) {
+        super.onAttachFragment(fragment);
+        if (fragment instanceof SetupChooseLockPasswordFragment) {
+            mFragment = (SetupChooseLockPasswordFragment) fragment;
+        }
+    }
+
+    public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment {
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            final View view = inflater.inflate(R.layout.setup_template, container, false);
+            ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
+            inflater.inflate(R.layout.setup_choose_lock_password, setupContent, true);
+            return view;
+        }
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            SetupWizardUtils.setIllustration(getActivity(),
+                    R.drawable.setup_illustration_lock_screen);
+            SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle());
+        }
+
+        @Override
+        protected Intent getRedactionInterstitialIntent(Context context) {
+            Intent intent = SetupRedactionInterstitial.createStartIntent(context);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        protected void setNextEnabled(boolean enabled) {
+            SetupChooseLockPassword activity = (SetupChooseLockPassword) getActivity();
+            activity.mNavigationBar.getNextButton().setEnabled(enabled);
+        }
+
+        @Override
+        protected void setNextText(int text) {
+            SetupChooseLockPassword activity = (SetupChooseLockPassword) getActivity();
+            activity.mNavigationBar.getNextButton().setText(text);
+        }
+    }
+}
diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/SetupChooseLockPattern.java
new file mode 100644
index 0000000..7f2480b
--- /dev/null
+++ b/src/com/android/settings/SetupChooseLockPattern.java
@@ -0,0 +1,152 @@
+/*
+ * 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.
+ */
+
+package com.android.settings;
+
+import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+/**
+ * Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
+ * from ChooseLockPattern class, and should remain similar to that behaviorally. This class should
+ * only overload base methods for minor theme and behavior differences specific to Setup Wizard.
+ * Other changes should be done to ChooseLockPattern class instead and let this class inherit
+ * those changes.
+ */
+public class SetupChooseLockPattern extends ChooseLockPattern
+        implements SetupWizardNavBar.NavigationBarListener {
+
+    public static Intent createIntent(Context context, final boolean isFallback,
+            boolean requirePassword, boolean confirmCredentials) {
+        Intent intent = ChooseLockPattern.createIntent(context, isFallback, requirePassword,
+                confirmCredentials);
+        intent.setClass(context, SetupChooseLockPattern.class);
+        return intent;
+    }
+
+    private SetupWizardNavBar mNavigationBar;
+    private SetupChooseLockPatternFragment mFragment;
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return SetupChooseLockPatternFragment.class.getName().equals(fragmentName);
+    }
+
+    @Override
+    /* package */ Class<? extends Fragment> getFragmentClass() {
+        return SetupChooseLockPatternFragment.class;
+    }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
+    @Override
+    public void onNavigationBarCreated(SetupWizardNavBar bar) {
+        mNavigationBar = bar;
+        SetupWizardUtils.setImmersiveMode(this, bar);
+    }
+
+    @Override
+    public void onNavigateBack() {
+        onBackPressed();
+    }
+
+    @Override
+    public void onNavigateNext() {
+        if (mFragment != null) {
+            mFragment.handleRightButton();
+        }
+    }
+
+    @Override
+    public void onAttachFragment(Fragment fragment) {
+        super.onAttachFragment(fragment);
+        if (fragment instanceof ChooseLockPatternFragment) {
+            mFragment = (SetupChooseLockPatternFragment) fragment;
+        }
+    }
+
+    public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment {
+
+        private Button mRetryButton;
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            final View view = inflater.inflate(R.layout.setup_template, container, false);
+            ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
+            inflater.inflate(R.layout.setup_choose_lock_pattern, setupContent, true);
+            return view;
+        }
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            mRetryButton = (Button) view.findViewById(R.id.retryButton);
+            mRetryButton.setOnClickListener(this);
+            super.onViewCreated(view, savedInstanceState);
+            SetupWizardUtils.setIllustration(getActivity(),
+                    R.drawable.setup_illustration_lock_screen);
+            SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle());
+        }
+
+        @Override
+        protected Intent getRedactionInterstitialIntent(Context context) {
+            Intent intent = SetupRedactionInterstitial.createStartIntent(context);
+            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
+            return intent;
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (v == mRetryButton) {
+                handleLeftButton();
+            } else {
+                super.onClick(v);
+            }
+        }
+
+        @Override
+        protected void setRightButtonEnabled(boolean enabled) {
+            SetupChooseLockPattern activity = (SetupChooseLockPattern) getActivity();
+            activity.mNavigationBar.getNextButton().setEnabled(enabled);
+        }
+
+        @Override
+        protected void setRightButtonText(int text) {
+            SetupChooseLockPattern activity = (SetupChooseLockPattern) getActivity();
+            activity.mNavigationBar.getNextButton().setText(text);
+        }
+
+        @Override
+        protected void updateStage(Stage stage) {
+            super.updateStage(stage);
+            // Only enable the button for retry
+            mRetryButton.setEnabled(stage == Stage.FirstChoiceValid);
+        }
+    }
+}
diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java
new file mode 100644
index 0000000..1e9a463
--- /dev/null
+++ b/src/com/android/settings/SetupEncryptionInterstitial.java
@@ -0,0 +1,104 @@
+/*
+ * 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
+ */
+
+package com.android.settings;
+
+import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Setup Wizard's version of EncryptionInterstitial screen. It inherits the logic and basic
+ * structure from EncryptionInterstitial class, and should remain similar to that behaviorally. This
+ * class should only overload base methods for minor theme and behavior differences specific to
+ * Setup Wizard. Other changes should be done to EncryptionInterstitial class instead and let this
+ * class inherit those changes.
+ */
+public class SetupEncryptionInterstitial extends EncryptionInterstitial
+        implements SetupWizardNavBar.NavigationBarListener{
+
+    public static Intent createStartIntent(Context ctx, int quality,
+            boolean requirePasswordDefault) {
+        Intent startIntent = EncryptionInterstitial.createStartIntent(ctx, quality,
+                requirePasswordDefault);
+        startIntent.setClass(ctx, SetupEncryptionInterstitial.class);
+        startIntent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false)
+                .putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, -1);
+        return startIntent;
+    }
+
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT,
+                SetupEncryptionInterstitialFragment.class.getName());
+        return modIntent;
+    }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return SetupEncryptionInterstitialFragment.class.getName().equals(fragmentName);
+    }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
+    @Override
+    public void onNavigationBarCreated(SetupWizardNavBar bar) {
+        SetupWizardUtils.setImmersiveMode(this, bar);
+    }
+
+    @Override
+    public void onNavigateBack() {
+        onBackPressed();
+    }
+
+    @Override
+    public void onNavigateNext() {
+        setResult(RESULT_OK, getResultIntentData());
+        finish();
+    }
+
+    public static class SetupEncryptionInterstitialFragment extends EncryptionInterstitialFragment {
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            View view = inflater.inflate(R.layout.setup_template, container, false);
+            ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
+            View content = super.onCreateView(inflater, setupContent, savedInstanceState);
+            setupContent.addView(content);
+            return view;
+        }
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            SetupWizardUtils.setIllustration(getActivity(),
+                    R.drawable.setup_illustration_lock_screen);
+            SetupWizardUtils.setHeaderText(getActivity(), R.string.encryption_interstitial_header);
+        }
+    }
+}
diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java
new file mode 100644
index 0000000..453e729
--- /dev/null
+++ b/src/com/android/settings/SetupRedactionInterstitial.java
@@ -0,0 +1,103 @@
+/*
+ * 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
+ */
+
+package com.android.settings;
+
+import com.android.settings.notification.RedactionInterstitial;
+import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Setup Wizard's version of RedactionInterstitial screen. It inherits the logic and basic structure
+ * from RedactionInterstitial class, and should remain similar to that behaviorally. This class
+ * should only overload base methods for minor theme and behavior differences specific to Setup
+ * Wizard. Other changes should be done to RedactionInterstitial class instead and let this class
+ * inherit those changes.
+ */
+public class SetupRedactionInterstitial extends RedactionInterstitial
+        implements SetupWizardNavBar.NavigationBarListener{
+
+    public static Intent createStartIntent(Context ctx) {
+        Intent startIntent = RedactionInterstitial.createStartIntent(ctx);
+        startIntent.setClass(ctx, SetupRedactionInterstitial.class);
+        startIntent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false)
+                .putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, -1);
+        return startIntent;
+    }
+
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT,
+                SetupEncryptionInterstitialFragment.class.getName());
+        return modIntent;
+    }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return SetupEncryptionInterstitialFragment.class.getName().equals(fragmentName);
+    }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent(), resid);
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
+    @Override
+    public void onNavigationBarCreated(SetupWizardNavBar bar) {
+        SetupWizardUtils.setImmersiveMode(this, bar);
+    }
+
+    @Override
+    public void onNavigateBack() {
+        onBackPressed();
+    }
+
+    @Override
+    public void onNavigateNext() {
+        setResult(RESULT_OK, getResultIntentData());
+        finish();
+    }
+
+    public static class SetupEncryptionInterstitialFragment extends RedactionInterstitialFragment {
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            View view = inflater.inflate(R.layout.setup_template, container, false);
+            ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content);
+            View content = super.onCreateView(inflater, setupContent, savedInstanceState);
+            setupContent.addView(content);
+            return view;
+        }
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            SetupWizardUtils.setIllustration(getActivity(),
+                    R.drawable.setup_illustration_lock_screen);
+            SetupWizardUtils.setHeaderText(getActivity(), R.string.notification_section_header);
+        }
+    }
+}
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
new file mode 100644
index 0000000..3d44125
--- /dev/null
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -0,0 +1,137 @@
+/*
+ * 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
+ */
+
+package com.android.settings;
+
+import com.android.settings.widget.SetupWizardIllustration;
+import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.view.Gravity;
+import android.view.Window;
+import android.widget.TextView;
+
+public class SetupWizardUtils {
+    private static final String TAG = "SetupWizardUtils";
+
+    // Extra containing the resource name of the theme to be used
+    public static final String EXTRA_THEME = "theme";
+    public static final String THEME_HOLO = "holo";
+    public static final String THEME_HOLO_LIGHT = "holo_light";
+    public static final String THEME_MATERIAL = "material";
+    public static final String THEME_MATERIAL_LIGHT = "material_light";
+
+    public static final String EXTRA_USE_IMMERSIVE_MODE = "useImmersiveMode";
+
+    // From WizardManager (must match constants maintained there)
+    public static final String ACTION_NEXT = "com.android.wizard.NEXT";
+    public static final String EXTRA_SCRIPT_URI = "scriptUri";
+    public static final String EXTRA_ACTION_ID = "actionId";
+    public static final String EXTRA_RESULT_CODE = "com.android.setupwizard.ResultCode";
+    public static final int NEXT_REQUEST = 10000;
+
+    public static boolean isUsingWizardManager(Activity activity) {
+        return activity.getIntent().hasExtra(EXTRA_SCRIPT_URI);
+    }
+
+    /**
+     * Send the results of this activity to WizardManager, which will then send out the next
+     * scripted activity. WizardManager does not actually return an activity result, but if we
+     * invoke WizardManager without requesting a result, the framework will choose not to issue a
+     * call to onActivityResult with RESULT_CANCELED when navigating backward.
+     */
+    public static void sendResultsToSetupWizard(Activity activity, int resultCode) {
+        final Intent intent = activity.getIntent();
+        final Intent nextIntent = new Intent(ACTION_NEXT);
+        nextIntent.putExtra(EXTRA_SCRIPT_URI, intent.getStringExtra(EXTRA_SCRIPT_URI));
+        nextIntent.putExtra(EXTRA_ACTION_ID, intent.getStringExtra(EXTRA_ACTION_ID));
+        nextIntent.putExtra(EXTRA_THEME, intent.getStringExtra(EXTRA_THEME));
+        nextIntent.putExtra(EXTRA_RESULT_CODE, resultCode);
+        activity.startActivityForResult(nextIntent, NEXT_REQUEST);
+    }
+
+    public static int getTheme(Intent intent, int defaultResId) {
+        final String themeName = intent.getStringExtra(EXTRA_THEME);
+        int resid = defaultResId;
+        if (THEME_HOLO_LIGHT.equalsIgnoreCase(themeName) ||
+                THEME_MATERIAL_LIGHT.equalsIgnoreCase(themeName)) {
+            resid = R.style.SetupWizardTheme_Light;
+        } else if (THEME_HOLO.equalsIgnoreCase(themeName) ||
+                THEME_MATERIAL.equalsIgnoreCase(themeName)) {
+            resid = R.style.SetupWizardTheme;
+        }
+        return resid;
+    }
+
+    /**
+     * Sets the immersive mode related flags based on the extra in the intent which started the
+     * activity.
+     */
+    public static void setImmersiveMode(Activity activity, SetupWizardNavBar navBar) {
+        final boolean useImmersiveMode =
+                activity.getIntent().getBooleanExtra(EXTRA_USE_IMMERSIVE_MODE, false);
+        navBar.setUseImmersiveMode(useImmersiveMode);
+        if (useImmersiveMode) {
+            final Window window = activity.getWindow();
+            window.setNavigationBarColor(Color.TRANSPARENT);
+            window.setStatusBarColor(Color.TRANSPARENT);
+        }
+    }
+
+    public static TextView getHeader(Activity activity) {
+        return (TextView) activity.findViewById(R.id.title);
+    }
+
+    public static void setHeaderText(Activity activity, int text) {
+        getHeader(activity).setText(text);
+    }
+
+    public static void setHeaderText(Activity activity, CharSequence text) {
+        getHeader(activity).setText(text);
+    }
+
+    public static void copySetupExtras(Intent fromIntent, Intent toIntent) {
+        toIntent.putExtra(EXTRA_THEME, fromIntent.getStringExtra(EXTRA_THEME));
+        toIntent.putExtra(EXTRA_USE_IMMERSIVE_MODE,
+                fromIntent.getBooleanExtra(EXTRA_USE_IMMERSIVE_MODE, false));
+    }
+
+    public static void setIllustration(Activity activity, int asset) {
+        SetupWizardIllustration illustration =
+                (SetupWizardIllustration) activity.findViewById(R.id.setup_illustration);
+        if (illustration != null) {
+            Drawable drawable = activity.getDrawable(R.drawable.setup_illustration);
+            Drawable newIllustration = activity.getDrawable(asset);
+            if (drawable instanceof LayerDrawable) {
+                LayerDrawable layers = (LayerDrawable) drawable;
+                Drawable oldIllustration = layers.findDrawableByLayerId(R.id.illustration_image);
+                if (newIllustration instanceof BitmapDrawable
+                        && oldIllustration instanceof BitmapDrawable) {
+                    final int gravity = ((BitmapDrawable) oldIllustration).getGravity();
+                    ((BitmapDrawable) newIllustration).setGravity(gravity);
+                }
+                layers.setDrawableByLayerId(R.id.illustration_image, newIllustration);
+                illustration.setForeground(layers);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index ad54c6b..0555c75 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -590,16 +590,52 @@
      * @param title String to display for the title of this set of preferences.
      */
     public static void startWithFragment(Context context, String fragmentName, Bundle args,
-            Fragment resultTo, int resultRequestCode, int titleResId, CharSequence title) {
+            Fragment resultTo, int resultRequestCode, int titleResId,
+            CharSequence title) {
         startWithFragment(context, fragmentName, args, resultTo, resultRequestCode,
-                titleResId, title, false /* not a shortcut */);
+                null /* titleResPackageName */, titleResId, title, false /* not a shortcut */);
+    }
+
+    /**
+     * Start a new instance of the activity, showing only the given fragment.
+     * When launched in this mode, the given preference fragment will be instantiated and fill the
+     * entire activity.
+     *
+     * @param context The context.
+     * @param fragmentName The name of the fragment to display.
+     * @param args Optional arguments to supply to the fragment.
+     * @param resultTo Option fragment that should receive the result of the activity launch.
+     * @param resultRequestCode If resultTo is non-null, this is the request code in which
+     *                          to report the result.
+     * @param titleResPackageName Optional package name for the resource id of the title.
+     * @param titleResId resource id for the String to display for the title of this set
+     *                   of preferences.
+     * @param title String to display for the title of this set of preferences.
+     */
+    public static void startWithFragment(Context context, String fragmentName, Bundle args,
+            Fragment resultTo, int resultRequestCode, String titleResPackageName, int titleResId,
+            CharSequence title) {
+        startWithFragment(context, fragmentName, args, resultTo, resultRequestCode,
+                titleResPackageName, titleResId, title, false /* not a shortcut */);
     }
 
     public static void startWithFragment(Context context, String fragmentName, Bundle args,
-            Fragment resultTo, int resultRequestCode, int titleResId, CharSequence title,
-            boolean isShortcut) {
-        Intent intent = onBuildStartFragmentIntent(context, fragmentName, args, titleResId,
-                title, isShortcut);
+            Fragment resultTo, int resultRequestCode, int titleResId,
+            CharSequence title, boolean isShortcut) {
+        Intent intent = onBuildStartFragmentIntent(context, fragmentName, args,
+                null /* titleResPackageName */, titleResId, title, isShortcut);
+        if (resultTo == null) {
+            context.startActivity(intent);
+        } else {
+            resultTo.startActivityForResult(intent, resultRequestCode);
+        }
+    }
+
+    public static void startWithFragment(Context context, String fragmentName, Bundle args,
+            Fragment resultTo, int resultRequestCode, String titleResPackageName, int titleResId,
+            CharSequence title, boolean isShortcut) {
+        Intent intent = onBuildStartFragmentIntent(context, fragmentName, args, titleResPackageName,
+                titleResId, title, isShortcut);
         if (resultTo == null) {
             context.startActivity(intent);
         } else {
@@ -608,9 +644,20 @@
     }
 
     public static void startWithFragmentAsUser(Context context, String fragmentName, Bundle args,
-            int titleResId, CharSequence title, boolean isShortcut, UserHandle userHandle) {
-        Intent intent = onBuildStartFragmentIntent(context, fragmentName, args, titleResId,
-                title, isShortcut);
+            int titleResId, CharSequence title, boolean isShortcut,
+            UserHandle userHandle) {
+        Intent intent = onBuildStartFragmentIntent(context, fragmentName, args,
+                null /* titleResPackageName */, titleResId, title, isShortcut);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        context.startActivityAsUser(intent, userHandle);
+    }
+
+    public static void startWithFragmentAsUser(Context context, String fragmentName, Bundle args,
+            String titleResPackageName, int titleResId, CharSequence title, boolean isShortcut,
+            UserHandle userHandle) {
+        Intent intent = onBuildStartFragmentIntent(context, fragmentName, args, titleResPackageName,
+                titleResId, title, isShortcut);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
         context.startActivityAsUser(intent, userHandle);
@@ -625,6 +672,7 @@
      * @param context The Context.
      * @param fragmentName The name of the fragment to display.
      * @param args Optional arguments to supply to the fragment.
+     * @param titleResPackageName Optional package name for the resource id of the title.
      * @param titleResId Optional title resource id to show for this item.
      * @param title Optional title to show for this item.
      * @param isShortcut  tell if this is a Launcher Shortcut or not
@@ -632,11 +680,14 @@
      * fragment.
      */
     public static Intent onBuildStartFragmentIntent(Context context, String fragmentName,
-            Bundle args, int titleResId, CharSequence title, boolean isShortcut) {
+            Bundle args, String titleResPackageName, int titleResId, CharSequence title,
+            boolean isShortcut) {
         Intent intent = new Intent(Intent.ACTION_MAIN);
         intent.setClass(context, SubSettings.class);
         intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, fragmentName);
         intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
+        intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RES_PACKAGE_NAME,
+                titleResPackageName);
         intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, titleResId);
         intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE, title);
         intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, isShortcut);
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 1bfa611..ffcb3b8 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -369,6 +369,8 @@
             if (label == null) {
                 continue;
             }
+            final String titleResPackageName = helper.getPackageForType(accountType);
+            final int titleResId = helper.getLabelIdForType(accountType);
 
             final Account[] accounts = AccountManager.get(getActivity())
                     .getAccountsByTypeAsUser(accountType, userHandle);
@@ -382,7 +384,8 @@
                 fragmentArguments.putParcelable(EXTRA_USER, userHandle);
 
                 accountTypePreferences.add(new AccountPreference(getActivity(), label,
-                        AccountSyncSettings.class.getName(), fragmentArguments,
+                        titleResPackageName, titleResId, AccountSyncSettings.class.getName(),
+                        fragmentArguments,
                         helper.getDrawableForType(getActivity(), accountType)));
             } else {
                 final Bundle fragmentArguments = new Bundle();
@@ -392,7 +395,8 @@
                 fragmentArguments.putParcelable(EXTRA_USER, userHandle);
 
                 accountTypePreferences.add(new AccountPreference(getActivity(), label,
-                        ManageAccountsSettings.class.getName(), fragmentArguments,
+                        titleResPackageName, titleResId, ManageAccountsSettings.class.getName(),
+                        fragmentArguments,
                         helper.getDrawableForType(getActivity(), accountType)));
             }
             helper.preloadDrawableForType(getActivity(), accountType);
@@ -435,6 +439,17 @@
         private final CharSequence mTitle;
 
         /**
+         * Packange name used to resolve the resources of the title shown to the user in the new
+         * fragment.
+         */
+        private final String mTitleResPackageName;
+
+        /**
+         * Resource id of the title shown to the user in the new fragment.
+         */
+        private final int mTitleResId;
+
+        /**
          * Full class name of the fragment to display when this tile is
          * selected.
          * @attr ref android.R.styleable#PreferenceHeader_fragment
@@ -447,10 +462,13 @@
          */
         private final Bundle mFragmentArguments;
 
-        public AccountPreference(Context context, CharSequence title, String fragment,
-                Bundle fragmentArguments, Drawable icon) {
+        public AccountPreference(Context context, CharSequence title, String titleResPackageName,
+                int titleResId, String fragment, Bundle fragmentArguments,
+                Drawable icon) {
             super(context);
             mTitle = title;
+            mTitleResPackageName = titleResPackageName;
+            mTitleResId = titleResId;
             mFragment = fragment;
             mFragmentArguments = fragmentArguments;
             setWidgetLayoutResource(R.layout.account_type_preference);
@@ -464,8 +482,9 @@
         @Override
         public boolean onPreferenceClick(Preference preference) {
             if (mFragment != null) {
-                Utils.startWithFragment(
-                        getContext(), mFragment, mFragmentArguments, null, 0, 0, mTitle);
+                Utils.startWithFragment(getContext(), mFragment, mFragmentArguments,
+                        null /* resultTo */, 0 /* resultRequestCode */, mTitleResPackageName,
+                        mTitleResId, null /* title */);
                 return true;
             }
             return false;
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index fe45299..858880b 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -91,20 +91,20 @@
                         new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        // TODO: We need an API to remove an account from a different user.
-                        // See: http://b/15466880
-                        AccountManager.get(AccountSyncSettings.this.getActivity())
-                                .removeAccountAsUser(mAccount,
-                                new AccountManagerCallback<Boolean>() {
+                        Activity activity = getActivity();
+                        AccountManager.get(activity)
+                                .removeAccountAsUser(mAccount, activity,
+                                new AccountManagerCallback<Bundle>() {
                             @Override
-                            public void run(AccountManagerFuture<Boolean> future) {
+                            public void run(AccountManagerFuture<Bundle> future) {
                                 // If already out of this screen, don't proceed.
                                 if (!AccountSyncSettings.this.isResumed()) {
                                     return;
                                 }
                                 boolean failed = true;
                                 try {
-                                    if (future.getResult() == true) {
+                                    if (future.getResult()
+                                            .getBoolean(AccountManager.KEY_BOOLEAN_RESULT)) {
                                         failed = false;
                                     }
                                 } catch (OperationCanceledException e) {
diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java
index 3757d97..86e0da5 100644
--- a/src/com/android/settings/accounts/AuthenticatorHelper.java
+++ b/src/com/android/settings/accounts/AuthenticatorHelper.java
@@ -148,6 +148,33 @@
     }
 
     /**
+     * Gets the package associated with a particular account type. If none found, return null.
+     * @param accountType the type of account
+     * @return the package name or null if one cannot be found.
+     */
+    public String getPackageForType(final String accountType) {
+        if (mTypeToAuthDescription.containsKey(accountType)) {
+            AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+            return desc.packageName;
+        }
+        return null;
+    }
+
+    /**
+     * Gets the resource id of the label associated with a particular account type. If none found,
+     * return -1.
+     * @param accountType the type of account
+     * @return a resource id for the label or -1 if none found;
+     */
+    public int getLabelIdForType(final String accountType) {
+        if (mTypeToAuthDescription.containsKey(accountType)) {
+            AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+            return desc.labelId;
+        }
+        return -1;
+    }
+
+    /**
      * Updates provider icons. Subclasses should call this in onCreate()
      * and update any UI that depends on AuthenticatorDescriptions in onAuthDescriptionsUpdated().
      */
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index 11daf0c..2d1da40 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -22,6 +22,8 @@
 import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.ServiceManager;
+import android.os.RemoteException;
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.preference.Preference;
@@ -34,9 +36,11 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.provider.Telephony;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.android.internal.telephony.ITelephony;
 import com.android.internal.telephony.DefaultPhoneNotifier;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
@@ -149,7 +153,7 @@
             }
         }
 
-        mSir = mSelectableSubInfos.get(0);
+        mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
         if (mSelectableSubInfos.size() > 1) {
             setContentView(R.layout.sim_information);
 
@@ -232,11 +236,18 @@
     private void updateNetworkType() {
         // Whether EDGE, UMTS, etc...
         String networktype = null;
-        if (TelephonyManager.NETWORK_TYPE_UNKNOWN
-                != mTelephonyManager.getNetworkType(mSir.getSubscriptionId())) {
-            networktype = mTelephonyManager.getNetworkTypeName(
-                    mTelephonyManager.getNetworkType(mSir.getSubscriptionId()));
+        final ITelephony telephony = ITelephony.Stub.asInterface(
+                ServiceManager.getService(Context.TELEPHONY_SERVICE));
+        try {
+            final int actualNetworkType = telephony.getVoiceNetworkTypeForSubscriber(
+                    mSir.getSubscriptionId());
+            if (TelephonyManager.NETWORK_TYPE_UNKNOWN != actualNetworkType) {
+                networktype = mTelephonyManager.getNetworkTypeName(actualNetworkType);
+            }
+        } catch (RemoteException remoteException){
+            // Do nothing, networkType will remain null.
         }
+
         setSummaryText(KEY_NETWORK_TYPE, networktype);
     }
 
@@ -332,7 +343,7 @@
             }
         }
 
-        String rawNumber = mPhone.getLine1Number();  // may be null or empty
+        String rawNumber = mTelephonyManager.getLine1Number();  // may be null or empty
         String formattedNumber = null;
         if (!TextUtils.isEmpty(rawNumber)) {
             formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
@@ -342,9 +353,7 @@
         final String imei = mPhone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
                 ? mPhone.getImei() : mPhone.getDeviceId();
         setSummaryText(KEY_IMEI, imei);
-        setSummaryText(KEY_IMEI_SV,
-                ((TelephonyManager) getSystemService(TELEPHONY_SERVICE))
-                .getDeviceSoftwareVersion(/*slotId*/));
+        setSummaryText(KEY_IMEI_SV, mTelephonyManager.getDeviceSoftwareVersion(/*slotId*/));
 
         if (!mShowLatestAreaInfo) {
             removePreferenceFromScreen(KEY_LATEST_AREA_INFO);
@@ -352,33 +361,35 @@
     }
 
     private void updatePhoneInfos() {
-        final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(
+        if (mSir != null) {
+            final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(
                         mSir.getSubscriptionId()));
-        if (UserHandle.myUserId() == UserHandle.USER_OWNER
-                && mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
-            if (phone == null) {
-                Log.e(TAG, "Unable to locate a phone object for the given Subscription ID.");
-                return;
+            if (UserHandle.myUserId() == UserHandle.USER_OWNER
+                    && mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                if (phone == null) {
+                    Log.e(TAG, "Unable to locate a phone object for the given Subscription ID.");
+                    return;
+                }
+
+                mPhone = phone;
+                mPhoneStateListener = new PhoneStateListener(mSir.getSubscriptionId()) {
+                    @Override
+                    public void onDataConnectionStateChanged(int state) {
+                        updateDataState();
+                        updateNetworkType();
+                    }
+
+                    @Override
+                    public void onSignalStrengthsChanged(SignalStrength signalStrength) {
+                        updateSignalStrength(signalStrength);
+                    }
+
+                    @Override
+                    public void onServiceStateChanged(ServiceState serviceState) {
+                        updateServiceState(serviceState);
+                    }
+                };
             }
-
-            mPhone = phone;
-            mPhoneStateListener = new PhoneStateListener(mSir.getSubscriptionId()) {
-                @Override
-                public void onDataConnectionStateChanged(int state) {
-                    updateDataState();
-                    updateNetworkType();
-                }
-
-                @Override
-                public void onSignalStrengthsChanged(SignalStrength signalStrength) {
-                    updateSignalStrength(signalStrength);
-                }
-
-                @Override
-                public void onServiceStateChanged(ServiceState serviceState) {
-                    updateServiceState(serviceState);
-                }
-            };
         }
     }
     private OnTabChangeListener mTabListener = new OnTabChangeListener() {
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index 94620cc..e6b90a7 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -63,7 +63,10 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        if (mCreated) return;
+        if (mCreated) {
+            mSwitchBar.show();
+            return;
+        }
         mCreated = true;
         addPreferencesFromResource(R.xml.battery_saver_settings);
 
diff --git a/src/com/android/settings/notification/NotificationSettings.java b/src/com/android/settings/notification/NotificationSettings.java
index bd08d8f..b392484 100644
--- a/src/com/android/settings/notification/NotificationSettings.java
+++ b/src/com/android/settings/notification/NotificationSettings.java
@@ -82,11 +82,13 @@
     private final H mHandler = new H();
     private final SettingsObserver mSettingsObserver = new SettingsObserver();
     private final Receiver mReceiver = new Receiver();
+    private final ArrayList<VolumeSeekBarPreference> mVolumePrefs = new ArrayList<>();
 
     private Context mContext;
     private PackageManager mPM;
     private boolean mVoiceCapable;
     private Vibrator mVibrator;
+    private AudioManager mAudioManager;
     private VolumeSeekBarPreference mRingOrNotificationPreference;
 
     private Preference mPhoneRingtonePreference;
@@ -98,7 +100,7 @@
     private boolean mSecure;
     private int mLockscreenSelectedValue;
     private ComponentName mSuppressor;
-    private int mRingOrNotificationProgress;
+    private int mRingerMode = -1;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -108,6 +110,7 @@
         mVoiceCapable = Utils.isVoiceCapable(mContext);
         mSecure = new LockPatternUtils(getActivity()).isSecure();
 
+        mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
         mVibrator = (Vibrator) getActivity().getSystemService(Context.VIBRATOR_SERVICE);
         if (mVibrator != null && !mVibrator.hasVibrator()) {
             mVibrator = null;
@@ -116,15 +119,19 @@
         addPreferencesFromResource(R.xml.notification_settings);
 
         final PreferenceCategory sound = (PreferenceCategory) findPreference(KEY_SOUND);
-        initVolumePreference(KEY_MEDIA_VOLUME, AudioManager.STREAM_MUSIC);
-        initVolumePreference(KEY_ALARM_VOLUME, AudioManager.STREAM_ALARM);
+        initVolumePreference(KEY_MEDIA_VOLUME, AudioManager.STREAM_MUSIC,
+                com.android.internal.R.drawable.ic_audio_vol_mute);
+        initVolumePreference(KEY_ALARM_VOLUME, AudioManager.STREAM_ALARM,
+                com.android.internal.R.drawable.ic_audio_alarm_mute);
         if (mVoiceCapable) {
             mRingOrNotificationPreference =
-                    initVolumePreference(KEY_RING_VOLUME, AudioManager.STREAM_RING);
+                    initVolumePreference(KEY_RING_VOLUME, AudioManager.STREAM_RING,
+                            com.android.internal.R.drawable.ic_audio_ring_notif_mute);
             sound.removePreference(sound.findPreference(KEY_NOTIFICATION_VOLUME));
         } else {
             mRingOrNotificationPreference =
-                    initVolumePreference(KEY_NOTIFICATION_VOLUME, AudioManager.STREAM_NOTIFICATION);
+                    initVolumePreference(KEY_NOTIFICATION_VOLUME, AudioManager.STREAM_NOTIFICATION,
+                            com.android.internal.R.drawable.ic_audio_ring_notif_mute);
             sound.removePreference(sound.findPreference(KEY_RING_VOLUME));
         }
         initRingtones(sound);
@@ -137,6 +144,7 @@
 
         mNotificationAccess = findPreference(KEY_NOTIFICATION_ACCESS);
         refreshNotificationListeners();
+        updateRingerMode();
         updateEffectsSuppressor();
     }
 
@@ -147,7 +155,11 @@
         lookupRingtoneNames();
         mSettingsObserver.register(true);
         mReceiver.register(true);
+        updateRingOrNotificationPreference();
         updateEffectsSuppressor();
+        for (VolumeSeekBarPreference volumePref : mVolumePrefs) {
+            volumePref.onActivityResume();
+        }
     }
 
     @Override
@@ -160,21 +172,28 @@
 
     // === Volumes ===
 
-    private VolumeSeekBarPreference initVolumePreference(String key, int stream) {
+    private VolumeSeekBarPreference initVolumePreference(String key, int stream, int muteIcon) {
         final VolumeSeekBarPreference volumePref = (VolumeSeekBarPreference) findPreference(key);
         volumePref.setCallback(mVolumeCallback);
         volumePref.setStream(stream);
+        mVolumePrefs.add(volumePref);
+        volumePref.setMuteIcon(muteIcon);
         return volumePref;
     }
 
-    private void updateRingOrNotificationIcon() {
+    private void updateRingOrNotificationPreference() {
         mRingOrNotificationPreference.showIcon(mSuppressor != null
                 ? com.android.internal.R.drawable.ic_audio_ring_notif_mute
-                : mRingOrNotificationProgress > 0
-                        ? com.android.internal.R.drawable.ic_audio_ring_notif
-                        : (mVibrator == null
-                                ? com.android.internal.R.drawable.ic_audio_ring_notif_mute
-                                : com.android.internal.R.drawable.ic_audio_ring_notif_vibrate));
+                : mRingerMode == AudioManager.RINGER_MODE_VIBRATE
+                ? com.android.internal.R.drawable.ic_audio_ring_notif_vibrate
+                : com.android.internal.R.drawable.ic_audio_ring_notif);
+    }
+
+    private void updateRingerMode() {
+        final int ringerMode = mAudioManager.getRingerModeInternal();
+        if (mRingerMode == ringerMode) return;
+        mRingerMode = ringerMode;
+        updateRingOrNotificationPreference();
     }
 
     private void updateEffectsSuppressor() {
@@ -187,7 +206,7 @@
                             getSuppressorCaption(suppressor)) : null;
             mRingOrNotificationPreference.setSuppressionText(text);
         }
-        updateRingOrNotificationIcon();
+        updateRingOrNotificationPreference();
     }
 
     private String getSuppressorCaption(ComponentName suppressor) {
@@ -226,10 +245,7 @@
 
         @Override
         public void onStreamValueChanged(int stream, int progress) {
-            if (stream == AudioManager.STREAM_RING) {
-                mHandler.removeMessages(H.UPDATE_RINGER_ICON);
-                mHandler.obtainMessage(H.UPDATE_RINGER_ICON, progress, 0).sendToTarget();
-            }
+            // noop
         }
 
         public void stopSample() {
@@ -510,8 +526,8 @@
         private static final int UPDATE_PHONE_RINGTONE = 1;
         private static final int UPDATE_NOTIFICATION_RINGTONE = 2;
         private static final int STOP_SAMPLE = 3;
-        private static final int UPDATE_RINGER_ICON = 4;
-        private static final int UPDATE_EFFECTS_SUPPRESSOR = 5;
+        private static final int UPDATE_EFFECTS_SUPPRESSOR = 4;
+        private static final int UPDATE_RINGER_MODE = 5;
 
         private H() {
             super(Looper.getMainLooper());
@@ -529,13 +545,12 @@
                 case STOP_SAMPLE:
                     mVolumeCallback.stopSample();
                     break;
-                case UPDATE_RINGER_ICON:
-                    mRingOrNotificationProgress = msg.arg1;
-                    updateRingOrNotificationIcon();
-                    break;
                 case UPDATE_EFFECTS_SUPPRESSOR:
                     updateEffectsSuppressor();
                     break;
+                case UPDATE_RINGER_MODE:
+                    updateRingerMode();
+                    break;
             }
         }
     }
@@ -546,8 +561,10 @@
         public void register(boolean register) {
             if (mRegistered == register) return;
             if (register) {
-                mContext.registerReceiver(this,
-                        new IntentFilter(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED));
+                final IntentFilter filter = new IntentFilter();
+                filter.addAction(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED);
+                filter.addAction(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION);
+                mContext.registerReceiver(this, filter);
             } else {
                 mContext.unregisterReceiver(this);
             }
@@ -556,7 +573,12 @@
 
         @Override
         public void onReceive(Context context, Intent intent) {
-            mHandler.sendEmptyMessage(H.UPDATE_EFFECTS_SUPPRESSOR);
+            final String action = intent.getAction();
+            if (NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED.equals(action)) {
+                mHandler.sendEmptyMessage(H.UPDATE_EFFECTS_SUPPRESSOR);
+            } else if (AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION.equals(action)) {
+                mHandler.sendEmptyMessage(H.UPDATE_RINGER_MODE);
+            }
         }
     }
 
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index 0fdcc19..9a892b8 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -47,6 +47,9 @@
     private ImageView mIconView;
     private TextView mSuppressionTextView;
     private String mSuppressionText;
+    private boolean mMuted;
+    private int mIconResId;
+    private int mMuteIconResId;
 
     public VolumeSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr,
             int defStyleRes) {
@@ -99,27 +102,38 @@
                     mCallback.onSampleStarting(sbv);
                 }
             }
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {
+                if (mCallback != null) {
+                    mCallback.onStreamValueChanged(mStream, progress);
+                }
+            }
+            @Override
+            public void onMuted(boolean muted) {
+                if (mMuted == muted) return;
+                mMuted = muted;
+                updateIconView();
+            }
         };
         final Uri sampleUri = mStream == AudioManager.STREAM_MUSIC ? getMediaVolumeUri() : null;
         if (mVolumizer == null) {
-            mVolumizer = new SeekBarVolumizer(getContext(), mStream, sampleUri, sbvc) {
-                // we need to piggyback on SBV's SeekBar listener to update our icon
-                @Override
-                public void onProgressChanged(SeekBar seekBar, int progress,
-                        boolean fromTouch) {
-                    super.onProgressChanged(seekBar, progress, fromTouch);
-                    mCallback.onStreamValueChanged(mStream, progress);
-                }
-            };
+            mVolumizer = new SeekBarVolumizer(getContext(), mStream, sampleUri, sbvc);
         }
         mVolumizer.start();
         mVolumizer.setSeekBar(mSeekBar);
         mIconView = (ImageView) view.findViewById(com.android.internal.R.id.icon);
+        updateIconView();
         mSuppressionTextView = (TextView) view.findViewById(R.id.suppression_text);
         mCallback.onStreamValueChanged(mStream, mSeekBar.getProgress());
         updateSuppressionText();
     }
 
+    public void onActivityResume() {
+        if (mVolumizer != null) {
+            mVolumizer.start();
+        }
+    }
+
     // during initialization, this preference is the SeekBar listener
     @Override
     public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {
@@ -127,12 +141,29 @@
         mCallback.onStreamValueChanged(mStream, progress);
     }
 
+    private void updateIconView() {
+        if (mIconView == null) return;
+        if (mIconResId != 0) {
+            mIconView.setImageResource(mIconResId);
+        } else if (mMuteIconResId != 0 && mMuted) {
+            mIconView.setImageResource(mMuteIconResId);
+        } else {
+            mIconView.setImageDrawable(getIcon());
+        }
+    }
+
     public void showIcon(int resId) {
         // Instead of using setIcon, which will trigger listeners, this just decorates the
         // preference temporarily with a new icon.
-        if (mIconView != null) {
-            mIconView.setImageResource(resId);
-        }
+        if (mIconResId == resId) return;
+        mIconResId = resId;
+        updateIconView();
+    }
+
+    public void setMuteIcon(int resId) {
+        if (mMuteIconResId == resId) return;
+        mMuteIconResId = resId;
+        updateIconView();
     }
 
     private Uri getMediaVolumeUri() {
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 49fd6df..e36e92c 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -137,6 +137,8 @@
 
     private boolean mServiceEnabled;
 
+    private SearchView mSearchView;
+
     @Override
     public void onResume() {
         super.onResume();
@@ -148,6 +150,9 @@
     @Override
     public void onPause() {
         mSettingsContentObserver.unregister(getContentResolver());
+        if (mSearchView != null) {
+            mSearchView.setOnQueryTextListener(null);
+        }
         super.onPause();
     }
 
@@ -408,8 +413,8 @@
 
         MenuItem searchItem = menu.findItem(R.id.print_menu_item_search);
         if (mServiceEnabled && mPrintersAdapter.getUnfilteredCount() > 0) {
-            SearchView searchView = (SearchView) searchItem.getActionView();
-            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            mSearchView = (SearchView) searchItem.getActionView();
+            mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                 @Override
                 public boolean onQueryTextSubmit(String query) {
                     return true;
@@ -421,7 +426,7 @@
                     return true;
                 }
             });
-            searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+            mSearchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
                 @Override
                 public void onViewAttachedToWindow(View view) {
                     if (AccessibilityManager.getInstance(getActivity()).isEnabled()) {
diff --git a/src/com/android/settings/sim/SimBootReceiver.java b/src/com/android/settings/sim/SimBootReceiver.java
index d3fb996..213a585 100644
--- a/src/com/android/settings/sim/SimBootReceiver.java
+++ b/src/com/android/settings/sim/SimBootReceiver.java
@@ -38,6 +38,7 @@
 import java.util.List;
 
 public class SimBootReceiver extends BroadcastReceiver {
+    private static final String TAG = "SimBootReceiver";
     private static final int SLOT_EMPTY = -1;
     private static final int NOTIFICATION_ID = 1;
     private static final String SHARED_PREFERENCES_NAME = "sim_state";
@@ -61,6 +62,9 @@
 
     private void detectChangeAndNotify() {
         final int numSlots = mTelephonyManager.getSimCount();
+        boolean notificationSent = false;
+        int numSIMsDetected = 0;
+        int lastSIMSlotDetected = -1;
 
         // Do not create notifications on single SIM devices.
         if (numSlots < 2) {
@@ -82,16 +86,32 @@
             final int lastSubId = getLastSubId(key);
 
             if (sir != null) {
+                numSIMsDetected++;
                 final int currentSubId = sir.getSubscriptionId();
                 if (lastSubId != currentSubId) {
                     createNotification(mContext);
                     setLastSubId(key, currentSubId);
+                    notificationSent = true;
                 }
+                lastSIMSlotDetected = i;
             } else if (lastSubId != SLOT_EMPTY) {
                 createNotification(mContext);
                 setLastSubId(key, SLOT_EMPTY);
+                notificationSent = true;
             }
         }
+
+        if (notificationSent) {
+            Intent intent = new Intent(mContext, SimDialogActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            if (numSIMsDetected == 1) {
+                intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.PREFERRED_PICK);
+                intent.putExtra(SimDialogActivity.PREFERRED_SIM, lastSIMSlotDetected);
+            } else {
+                intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.DATA_PICK);
+            }
+            mContext.startActivity(intent);
+        }
     }
 
     private int getLastSubId(String strSlotId) {
@@ -141,4 +161,5 @@
             detectChangeAndNotify();
         }
     };
+
 }
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
new file mode 100644
index 0000000..cf3ccdf
--- /dev/null
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -0,0 +1,313 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.sim;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneFactory;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class SimDialogActivity extends Activity {
+    private static String TAG = "SimDialogActivity";
+
+    public static String PREFERRED_SIM = "preferred_sim";
+    public static String DIALOG_TYPE_KEY = "dialog_type";
+    public static final int INVALID_PICK = -1;
+    public static final int DATA_PICK = 0;
+    public static final int CALLS_PICK = 1;
+    public static final int SMS_PICK = 2;
+    public static final int PREFERRED_PICK = 3;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final Bundle extras = getIntent().getExtras();
+        final int dialogType = extras.getInt(DIALOG_TYPE_KEY, INVALID_PICK);
+
+        switch (dialogType) {
+            case DATA_PICK:
+            case CALLS_PICK:
+            case SMS_PICK:
+                createDialog(this, dialogType).show();
+                break;
+            case PREFERRED_PICK:
+                displayPreferredDialog(extras.getInt(PREFERRED_SIM));
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid dialog type " + dialogType + " sent.");
+        }
+
+    }
+
+    private void displayPreferredDialog(final int slotId) {
+        final Resources res = getResources();
+        final Context context = getApplicationContext();
+        final SubscriptionInfo sir = Utils.findRecordBySlotId(context, slotId);
+
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+        alertDialogBuilder.setTitle(R.string.sim_preferred_title);
+        alertDialogBuilder.setMessage(res.getString(
+                    R.string.sim_preferred_message, sir.getDisplayName()));
+
+        alertDialogBuilder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int id) {
+                final int subId = sir.getSubscriptionId();
+                PhoneAccountHandle phoneAccountHandle = subscriptionIdToPhoneAccountHandle(subId);
+                setDefaultDataSubId(context, subId);
+                setDefaultSmsSubId(context, subId);
+                setUserSelectedOutgoingPhoneAccount(phoneAccountHandle);
+                finish();
+            }
+        });
+        alertDialogBuilder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog,int id) {
+                finish();
+            }
+        });
+
+        alertDialogBuilder.create().show();
+    }
+
+    private static void setDefaultDataSubId(final Context context, final int subId) {
+        final SubscriptionManager subscriptionManager = SubscriptionManager.from(context);
+        subscriptionManager.setDefaultDataSubId(subId);
+    }
+
+    private static void setDefaultSmsSubId(final Context context, final int subId) {
+        final SubscriptionManager subscriptionManager = SubscriptionManager.from(context);
+        subscriptionManager.setDefaultSmsSubId(subId);
+    }
+
+    private void setUserSelectedOutgoingPhoneAccount(PhoneAccountHandle phoneAccount) {
+        final TelecomManager telecomManager = TelecomManager.from(this);
+        telecomManager.setUserSelectedOutgoingPhoneAccount(phoneAccount);
+    }
+
+    private PhoneAccountHandle subscriptionIdToPhoneAccountHandle(final int subId) {
+        final TelecomManager telecomManager = TelecomManager.from(this);
+        final Iterator<PhoneAccountHandle> phoneAccounts =
+                telecomManager.getCallCapablePhoneAccounts().listIterator();
+
+        while (phoneAccounts.hasNext()) {
+            final PhoneAccountHandle phoneAccountHandle = phoneAccounts.next();
+            final PhoneAccount phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle);
+            final String phoneAccountId = phoneAccountHandle.getId();
+
+            if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)
+                    && TextUtils.isDigitsOnly(phoneAccountId)
+                    && Integer.parseInt(phoneAccountId) == subId){
+                return phoneAccountHandle;
+            }
+        }
+
+        return null;
+    }
+
+    public Dialog createDialog(final Context context, final int id) {
+        final ArrayList<String> list = new ArrayList<String>();
+        final SubscriptionManager subscriptionManager = SubscriptionManager.from(context);
+        final List<SubscriptionInfo> subInfoList =
+            subscriptionManager.getActiveSubscriptionInfoList();
+        final int selectableSubInfoLength = subInfoList.size();
+
+        final DialogInterface.OnClickListener selectionListener =
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int value) {
+
+                        final SubscriptionInfo sir;
+
+                        switch (id) {
+                            case DATA_PICK:
+                                sir = subInfoList.get(value);
+                                setDefaultDataSubId(context, sir.getSubscriptionId());
+                                break;
+                            case CALLS_PICK:
+                                final TelecomManager telecomManager =
+                                        TelecomManager.from(context);
+                                final List<PhoneAccountHandle> phoneAccountsList =
+                                        telecomManager.getCallCapablePhoneAccounts();
+                                setUserSelectedOutgoingPhoneAccount(
+                                        value < 1 ? null : phoneAccountsList.get(value - 1));
+                                break;
+                            case SMS_PICK:
+                                sir = subInfoList.get(value);
+                                setDefaultSmsSubId(context, sir.getSubscriptionId());
+                                break;
+                            default:
+                                throw new IllegalArgumentException("Invalid dialog type "
+                                        + id + " in SIM dialog.");
+                        }
+
+                        finish();
+                    }
+                };
+
+        Dialog.OnKeyListener keyListener = new Dialog.OnKeyListener() {
+            @Override
+            public boolean onKey(DialogInterface arg0, int keyCode,
+                    KeyEvent event) {
+                    if (keyCode == KeyEvent.KEYCODE_BACK) {
+                        finish();
+                    }
+                    return true;
+                }
+            };
+
+        if (id == CALLS_PICK) {
+            final TelecomManager telecomManager = TelecomManager.from(context);
+            final Iterator<PhoneAccountHandle> phoneAccounts =
+                    telecomManager.getCallCapablePhoneAccounts().listIterator();
+
+            list.add(getResources().getString(R.string.sim_calls_ask_first_prefs_title));
+            while (phoneAccounts.hasNext()) {
+                final PhoneAccount phoneAccount =
+                        telecomManager.getPhoneAccount(phoneAccounts.next());
+                list.add((String)phoneAccount.getLabel());
+            }
+        } else {
+            for (int i = 0; i < selectableSubInfoLength; ++i) {
+                final SubscriptionInfo sir = subInfoList.get(i);
+                CharSequence displayName = sir.getDisplayName();
+                if (displayName == null) {
+                    displayName = "";
+                }
+                list.add(displayName.toString());
+            }
+        }
+
+        String[] arr = list.toArray(new String[0]);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+
+        ListAdapter adapter = new SelectAccountListAdapter(
+                subInfoList,
+                builder.getContext(),
+                R.layout.select_account_list_item,
+                arr, id);
+
+        switch (id) {
+            case DATA_PICK:
+                builder.setTitle(R.string.select_sim_for_data);
+                break;
+            case CALLS_PICK:
+                builder.setTitle(R.string.select_sim_for_calls);
+                break;
+            case SMS_PICK:
+                builder.setTitle(R.string.sim_card_select_title);
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid dialog type "
+                        + id + " in SIM dialog.");
+        }
+
+        Dialog dialog = builder.setAdapter(adapter, selectionListener).create();
+        dialog.setOnKeyListener(keyListener);
+
+        return dialog;
+
+    }
+
+    private class SelectAccountListAdapter extends ArrayAdapter<String> {
+        private Context mContext;
+        private int mResId;
+        private int mDialogId;
+        private final float OPACITY = 0.54f;
+        private List<SubscriptionInfo> mSubInfoList;
+
+        public SelectAccountListAdapter(List<SubscriptionInfo> subInfoList,
+                Context context, int resource, String[] arr, int dialogId) {
+            super(context, resource, arr);
+            mContext = context;
+            mResId = resource;
+            mDialogId = dialogId;
+            mSubInfoList = subInfoList;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            LayoutInflater inflater = (LayoutInflater)
+                    mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            View rowView;
+            final ViewHolder holder;
+            SubscriptionInfo sir;
+
+            if (convertView == null) {
+                // Cache views for faster scrolling
+                rowView = inflater.inflate(mResId, null);
+                holder = new ViewHolder();
+                holder.title = (TextView) rowView.findViewById(R.id.title);
+                holder.summary = (TextView) rowView.findViewById(R.id.summary);
+                holder.icon = (ImageView) rowView.findViewById(R.id.icon);
+                rowView.setTag(holder);
+            } else {
+                rowView = convertView;
+                holder = (ViewHolder) rowView.getTag();
+            }
+
+            if (mDialogId == CALLS_PICK) {
+                holder.title.setText(getItem(position));
+                holder.summary.setText("");
+                holder.icon.setImageDrawable(getResources()
+                        .getDrawable(R.drawable.ic_live_help));
+                holder.icon.setAlpha(OPACITY);
+            } else {
+                sir = mSubInfoList.get(position);
+                holder.title.setText(sir.getDisplayName());
+                holder.summary.setText(sir.getNumber());
+                holder.icon.setImageBitmap(sir.createIconBitmap(mContext));
+            }
+            return rowView;
+        }
+
+        private class ViewHolder {
+            TextView title;
+            TextView summary;
+            ImageView icon;
+        }
+    }
+}
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 3869cd3..ccd7ce1 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.ContentUris;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Paint;
@@ -29,7 +30,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.Preference;
-import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
 import android.provider.SearchIndexableResource;
 import android.provider.Telephony;
@@ -117,7 +117,7 @@
     private SubscriptionInfo mCalls = null;
     private SubscriptionInfo mSMS = null;
 
-    private PreferenceCategory mSimCards = null;
+    private PreferenceScreen mSimCards = null;
 
     private SubscriptionManager mSubscriptionManager;
     private Utils mUtils;
@@ -150,14 +150,16 @@
 
         addPreferencesFromResource(R.xml.sim_settings);
 
-        mSimCards = (PreferenceCategory)findPreference(SIM_CARD_CATEGORY);
+        mSimCards = (PreferenceScreen)findPreference(SIM_CARD_CATEGORY);
 
         final int numSlots = tm.getSimCount();
         mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
         mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
         for (int i = 0; i < numSlots; ++i) {
             final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), i);
-            mSimCards.addPreference(new SimPreference(getActivity(), sir, i));
+            SimPreference simPreference = new SimPreference(getActivity(), sir, i);
+            simPreference.setOrder(i-numSlots);
+            mSimCards.addPreference(simPreference);
             mAvailableSubInfos.add(sir);
             if (sir != null) {
                 mSelectableSubInfos.add(sir);
@@ -264,14 +266,21 @@
     @Override
     public boolean onPreferenceTreeClick(final PreferenceScreen preferenceScreen,
             final Preference preference) {
+        final Context context = getActivity();
+        Intent intent = new Intent(context, SimDialogActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
         if (preference instanceof SimPreference) {
             ((SimPreference)preference).createEditDialog((SimPreference)preference);
         } else if (findPreference(KEY_CELLULAR_DATA) == preference) {
-            showDialog(DATA_PICK);
+            intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.DATA_PICK);
+            context.startActivity(intent);
         } else if (findPreference(KEY_CALLS) == preference) {
-            showDialog(CALLS_PICK);
+            intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.CALLS_PICK);
+            context.startActivity(intent);
         } else if (findPreference(KEY_SMS) == preference) {
-            showDialog(SMS_PICK);
+            intent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, SimDialogActivity.SMS_PICK);
+            context.startActivity(intent);
         }
 
         return true;
@@ -410,7 +419,7 @@
             } else {
                 sir = mSelectableSubInfos.get(position);
                 holder.title.setText(sir.getDisplayName());
-                holder.summary.setText(sir.getNumber());
+                holder.summary.setText(getPhoneNumber(sir));
                 holder.icon.setImageBitmap(sir.createIconBitmap(mContext));
             }
             return rowView;
@@ -450,11 +459,11 @@
             setTitle(String.format(getResources()
                     .getString(R.string.sim_editor_title), (mSlotId + 1)));
             if (mSubInfoRecord != null) {
-                if (TextUtils.isEmpty(mSubInfoRecord.getNumber().toString())) {
+                if (TextUtils.isEmpty(getPhoneNumber(mSubInfoRecord))) {
                    setSummary(mSubInfoRecord.getDisplayName());
                 } else {
                     setSummary(mSubInfoRecord.getDisplayName() + " - " +
-                            mSubInfoRecord.getNumber().toString());
+                            getPhoneNumber(mSubInfoRecord));
                     setEnabled(true);
                 }
                 setIcon(new BitmapDrawable(res, (mSubInfoRecord.createIconBitmap(mContext))));
@@ -509,7 +518,7 @@
             });
 
             TextView numberView = (TextView)dialogLayout.findViewById(R.id.number);
-            final String rawNumber = mSubInfoRecord.getNumber();
+            final String rawNumber = getPhoneNumber(mSubInfoRecord);
             if (TextUtils.isEmpty(rawNumber)) {
                 numberView.setText(res.getString(com.android.internal.R.string.unknownName));
             } else {
@@ -627,6 +636,14 @@
 
     }
 
+    // Returns the line1Number. Line1number should always be read from TelephonyManager since it can
+    // be overridden for display purposes.
+    private String getPhoneNumber(SubscriptionInfo info) {
+        final TelephonyManager tm =
+            (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
+        return tm.getLine1NumberForSubscriber(info.getSubscriptionId());
+    }
+
     private void log(String s) {
         Log.d(TAG, s);
     }
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index b95c397..d7923ee 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -573,20 +573,22 @@
                 addProfileItem.put(KEY_SUMMARY, getString(R.string.user_add_profile_item_summary));
                 data.add(addUserItem);
                 data.add(addProfileItem);
-                Dialog dlg = new AlertDialog.Builder(context)
-                        .setTitle(R.string.user_add_user_type_title)
-                        .setAdapter(new SimpleAdapter(context, data, R.layout.two_line_list_item,
-                                new String[] {KEY_TITLE, KEY_SUMMARY},
-                                new int[] {R.id.title, R.id.summary}),
-                                new DialogInterface.OnClickListener() {
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        onAddUserClicked(which == 0
-                                                ? USER_TYPE_USER
-                                                : USER_TYPE_RESTRICTED_PROFILE);
-                                    }
-                                })
-                        .create();
-                return dlg;
+                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                SimpleAdapter adapter = new SimpleAdapter(builder.getContext(),
+                        data, R.layout.two_line_list_item,
+                        new String[] {KEY_TITLE, KEY_SUMMARY},
+                        new int[] {R.id.title, R.id.summary});
+                builder.setTitle(R.string.user_add_user_type_title);
+                builder.setAdapter(adapter,
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                onAddUserClicked(which == 0
+                                        ? USER_TYPE_USER
+                                        : USER_TYPE_RESTRICTED_PROFILE);
+                            }
+                        });
+                return builder.create();
             }
             case DIALOG_NEED_LOCKSCREEN: {
                 Dialog dlg = new AlertDialog.Builder(context)
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index e6dd9c7..b00faf1 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -307,7 +307,8 @@
             }
         }
 
-        if (mEdit || (mAccessPoint.getState() == null && mAccessPoint.getLevel() != -1)){
+        if ((mEdit) || (mAccessPoint != null
+                && mAccessPoint.getState() == null && mAccessPoint.getLevel() != -1)){
             mConfigUi.setCancelButton(res.getString(R.string.wifi_cancel));
         }else{
             mConfigUi.setCancelButton(res.getString(R.string.wifi_display_options_done));
diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java
index a87c733..a036bae 100644
--- a/src/com/android/settings/wifi/WifiSetupActivity.java
+++ b/src/com/android/settings/wifi/WifiSetupActivity.java
@@ -25,7 +25,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
-import android.graphics.Color;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
@@ -35,6 +34,7 @@
 
 import com.android.settings.ButtonBarHandler;
 import com.android.settings.R;
+import com.android.settings.SetupWizardUtils;
 import com.android.setupwizard.navigationbar.SetupWizardNavBar;
 import com.android.setupwizard.navigationbar.SetupWizardNavBar.NavigationBarListener;
 
@@ -43,7 +43,6 @@
     private static final String TAG = "WifiSetupActivity";
 
     private static final String EXTRA_ALLOW_SKIP = "allowSkip";
-    private static final String EXTRA_USE_IMMERSIVE_MODE = "useImmersiveMode";
 
     // this boolean extra specifies whether to auto finish when connection is established
     private static final String EXTRA_AUTO_FINISH_ON_CONNECT = "wifi_auto_finish_on_connect";
@@ -52,26 +51,12 @@
     private static final String EXTRA_REQUIRE_USER_NETWORK_SELECTION =
             "wifi_require_user_network_selection";
 
-    // Extra containing the resource name of the theme to be used
-    private static final String EXTRA_THEME = "theme";
-    private static final String THEME_HOLO = "holo";
-    private static final String THEME_HOLO_LIGHT = "holo_light";
-    private static final String THEME_MATERIAL = "material";
-    private static final String THEME_MATERIAL_LIGHT = "material_light";
-
     // Key for whether the user selected network in saved instance state bundle
     private static final String PARAM_USER_SELECTED_NETWORK = "userSelectedNetwork";
 
     // Activity result when pressing the Skip button
     private static final int RESULT_SKIP = Activity.RESULT_FIRST_USER;
 
-    // From WizardManager (must match constants maintained there)
-    private static final String ACTION_NEXT = "com.android.wizard.NEXT";
-    private static final String EXTRA_SCRIPT_URI = "scriptUri";
-    private static final String EXTRA_ACTION_ID = "actionId";
-    private static final String EXTRA_RESULT_CODE = "com.android.setupwizard.ResultCode";
-    private static final int NEXT_REQUEST = 10000;
-
     // Whether we allow skipping without a valid network connection
     private boolean mAllowSkip = true;
     // Whether to auto finish when the user selected a network and successfully connected
@@ -168,14 +153,7 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        String themeName = getIntent().getStringExtra(EXTRA_THEME);
-        if (THEME_HOLO_LIGHT.equalsIgnoreCase(themeName) ||
-                THEME_MATERIAL_LIGHT.equalsIgnoreCase(themeName)) {
-            resid = R.style.SetupWizardWifiTheme_Light;
-        } else if (THEME_HOLO.equalsIgnoreCase(themeName) ||
-                THEME_MATERIAL.equalsIgnoreCase(themeName)) {
-            resid = R.style.SetupWizardWifiTheme;
-        }
+        resid = SetupWizardUtils.getTheme(getIntent(), resid);
         super.onApplyThemeResource(theme, resid, first);
     }
 
@@ -195,45 +173,19 @@
      */
     public void finishOrNext(int resultCode) {
         Log.d(TAG, "finishOrNext resultCode=" + resultCode
-                + " isUsingWizardManager=" + isUsingWizardManager());
-        if (isUsingWizardManager()) {
-            sendResultsToSetupWizard(resultCode);
+                + " isUsingWizardManager=" + SetupWizardUtils.isUsingWizardManager(this));
+        if (SetupWizardUtils.isUsingWizardManager(this)) {
+            SetupWizardUtils.sendResultsToSetupWizard(this, resultCode);
         } else {
             setResult(resultCode);
             finish();
         }
     }
 
-    private boolean isUsingWizardManager() {
-        return getIntent().hasExtra(EXTRA_SCRIPT_URI);
-    }
-
-    /**
-     * Send the results of this activity to WizardManager, which will then send out the next
-     * scripted activity. WizardManager does not actually return an activity result, but if we
-     * invoke WizardManager without requesting a result, the framework will choose not to issue a
-     * call to onActivityResult with RESULT_CANCELED when navigating backward.
-     */
-    private void sendResultsToSetupWizard(int resultCode) {
-        final Intent intent = getIntent();
-        final Intent nextIntent = new Intent(ACTION_NEXT);
-        nextIntent.putExtra(EXTRA_SCRIPT_URI, intent.getStringExtra(EXTRA_SCRIPT_URI));
-        nextIntent.putExtra(EXTRA_ACTION_ID, intent.getStringExtra(EXTRA_ACTION_ID));
-        nextIntent.putExtra(EXTRA_THEME, intent.getStringExtra(EXTRA_THEME));
-        nextIntent.putExtra(EXTRA_RESULT_CODE, resultCode);
-        startActivityForResult(nextIntent, NEXT_REQUEST);
-    }
-
     @Override
     public void onNavigationBarCreated(final SetupWizardNavBar bar) {
         mNavigationBar = bar;
-        final boolean useImmersiveMode =
-                getIntent().getBooleanExtra(EXTRA_USE_IMMERSIVE_MODE, false);
-        bar.setUseImmersiveMode(useImmersiveMode);
-        if (useImmersiveMode) {
-            getWindow().setNavigationBarColor(Color.TRANSPARENT);
-            getWindow().setStatusBarColor(Color.TRANSPARENT);
-        }
+        SetupWizardUtils.setImmersiveMode(this, bar);
     }
 
     @Override
@@ -287,7 +239,7 @@
             return new AlertDialog.Builder(getActivity())
                     .setMessage(messageRes)
                     .setCancelable(false)
-                    .setNegativeButton(R.string.wifi_skip_anyway,
+                    .setPositiveButton(R.string.wifi_skip_anyway,
                             new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int id) {
@@ -295,7 +247,7 @@
                             activity.finishOrNext(RESULT_SKIP);
                         }
                     })
-                    .setPositiveButton(R.string.wifi_dont_skip,
+                    .setNegativeButton(R.string.wifi_dont_skip,
                             new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int id) {