diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b4841dc..5e10171 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -692,17 +692,6 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="SettingsSafetyLegalActivity"
-                android:label="@string/settings_safetylegal_activity_title"
-                android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
-            <intent-filter>
-                <action android:name="android.settings.SAFETY" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
-
         <activity android:name="Settings$ManageApplicationsActivity"
                 android:label="@string/applications_settings"
                 android:taskAffinity="">
@@ -1179,6 +1168,18 @@
         </activity>
 
         <!-- Runs in the phone process since it needs access to the Phone object -->
+        <activity android:name=".deviceinfo.SimStatus"
+                android:label="@string/sim_status_title"
+                android:theme="@style/Theme.SubSettingsDialogWhenLarge"
+                android:process="com.android.phone">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+            </intent-filter>
+        </activity>
+
+        <!-- Runs in the phone process since it needs access to the Phone object -->
         <activity android:name=".deviceinfo.ImeiInformation"
                 android:label="@string/imei_information_title"
                 android:theme="@style/Theme.SubSettingsDialogWhenLarge"
diff --git a/res/drawable-hdpi/ic_live_help.png b/res/drawable-hdpi/ic_live_help.png
new file mode 100644
index 0000000..f3548f6
--- /dev/null
+++ b/res/drawable-hdpi/ic_live_help.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_live_help.png b/res/drawable-mdpi/ic_live_help.png
new file mode 100644
index 0000000..e958662
--- /dev/null
+++ b/res/drawable-mdpi/ic_live_help.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_live_help.png b/res/drawable-xhdpi/ic_live_help.png
new file mode 100644
index 0000000..dbbbfed
--- /dev/null
+++ b/res/drawable-xhdpi/ic_live_help.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_live_help.png b/res/drawable-xxhdpi/ic_live_help.png
new file mode 100644
index 0000000..f2a01fe
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_live_help.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_live_help.png b/res/drawable-xxxhdpi/ic_live_help.png
new file mode 100644
index 0000000..00338a0
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_live_help.png
Binary files differ
diff --git a/res/drawable/ic_audio_alarm_24dp.xml b/res/drawable/ic_audio_alarm_24dp.xml
deleted file mode 100644
index ddfaa01..0000000
--- a/res/drawable/ic_audio_alarm_24dp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-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.
--->
-<!-- shrink ic_audio_alarm from 32dp to 24dp using insets -->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@*android:drawable/ic_audio_alarm"
-        android:inset="4dp"
-        />
diff --git a/res/drawable/ic_audio_vol_24dp.xml b/res/drawable/ic_audio_vol_24dp.xml
deleted file mode 100644
index ecb3a40..0000000
--- a/res/drawable/ic_audio_vol_24dp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-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.
--->
-<!-- shrink ic_audio_vol from 32dp to 24dp using insets -->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@*android:drawable/ic_audio_vol"
-        android:inset="4dp"
-        />
diff --git a/res/drawable/ring_notif.xml b/res/drawable/ring_notif.xml
deleted file mode 100644
index cc9da31..0000000
--- a/res/drawable/ring_notif.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-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.
--->
-<!-- shrink ic_audio_ring_notif from 32dp to 24dp using insets -->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@*android:drawable/ic_audio_ring_notif"
-        android:inset="4dp"
-        />
-
diff --git a/res/drawable/ring_notif_mute.xml b/res/drawable/ring_notif_mute.xml
deleted file mode 100644
index fe9417d..0000000
--- a/res/drawable/ring_notif_mute.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-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.
--->
-<!-- shrink ic_audio_ring_notif_mute from 32dp to 24dp using insets -->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@*android:drawable/ic_audio_ring_notif_mute"
-        android:inset="4dp"
-        />
diff --git a/res/drawable/ring_notif_vibrate.xml b/res/drawable/ring_notif_vibrate.xml
deleted file mode 100644
index 37113d7..0000000
--- a/res/drawable/ring_notif_vibrate.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-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.
--->
-<!-- shrink ic_audio_ring_notif_vibrate from 32dp to 24dp using insets -->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@*android:drawable/ic_audio_ring_notif_vibrate"
-        android:inset="4dp"
-        />
diff --git a/res/layout/preference_volume_slider.xml b/res/layout/preference_volume_slider.xml
new file mode 100644
index 0000000..878a710
--- /dev/null
+++ b/res/layout/preference_volume_slider.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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginTop="8dip"
+        android:layout_marginBottom="8dip">
+
+        <TextView android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+            android:textColor="?android:attr/textColorPrimary"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp">
+
+            <ImageView
+                android:id="@android:id/icon"
+                android:layout_gravity="center_vertical|start"
+                android:layout_width="24dp"
+                android:layout_height="24dp" />
+
+            <SeekBar android:id="@*android:id/seekbar"
+                android:layout_marginStart="24dp"
+                android:layout_gravity="center_vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <TextView android:id="@+id/suppression_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|start"
+                android:textAlignment="viewStart"
+                android:layout_marginStart="24dp"
+                android:paddingStart="14dp"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textColor="?android:attr/textColorSecondary" />
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/res/layout/select_account_list_item.xml b/res/layout/select_account_list_item.xml
index d80fef5..55484b1 100644
--- a/res/layout/select_account_list_item.xml
+++ b/res/layout/select_account_list_item.xml
@@ -14,11 +14,12 @@
      limitations under the License.
 -->
 
-<!-- Layout of a single item in the InCallUI Account Chooser Dialog. -->
+<!-- Layout of a single item for displaying sim cards. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
     android:padding="4dp" >
 
     <ImageView android:id="@+id/icon"
@@ -26,11 +27,32 @@
         android:layout_height="48dp"
         android:scaleType="center" />
 
-    <TextView android:id="@+id/text"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:gravity="start|center_vertical"
-        android:layout_marginLeft="8dp"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_marginStart="15dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_height="wrap_content"
         android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="match_parent" />
+        android:layout_weight="1" >
+        <TextView android:id="@+id/title"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:gravity="start|center_vertical"
+            android:layout_marginLeft="8dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+        <TextView android:id="@+id/summary"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:gravity="start|center_vertical"
+            android:layout_marginLeft="8dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/title"
+            android:textColor="?android:attr/textColorSecondary"
+            android:layout_alignStart="@id/title" />
+    </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/sim_information.xml b/res/layout/sim_information.xml
new file mode 100644
index 0000000..d2a4acc
--- /dev/null
+++ b/res/layout/sim_information.xml
@@ -0,0 +1,60 @@
+<?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.
+-->
+
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/tabhost"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/tabs_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbars="none"
+            android:fillViewport="true">
+
+            <TabWidget
+                android:id="@android:id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                style="?android:attr/tabWidgetStyle" />
+
+        </HorizontalScrollView>
+
+        <!-- give an empty content area to make tabhost happy -->
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="0dip"
+            android:layout_height="0dip" />
+
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:smoothScrollbar="false" />
+
+    </LinearLayout>
+
+</TabHost>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2b6219d..f3a0062 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Outomatiese helderheid"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lig op om wakker te maak"</string>
     <string name="doze_title" msgid="2259176504273878294">"Stemmingvertoning"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Maak skerm wakker as toestel opgetel word of kennisgewings opdaag"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Fontgrootte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kaart se sluitinstellings"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Weekaande"</string>
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> volgende dag"</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="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>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index a8f0db5..b9a20c2 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"መሣሪያው ካለበት ሲነሳ ወይም ማሳወቂያዎች ሲመጡ ማያ ገጽ አንቃ"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ቀጣዩ ቀን"</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="notification_settings_apps_title" msgid="1125354590652967250">"የመተግበሪያ ማሳወቂያዎች"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"የማሳወቂያ ቅንብሮች"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ስለዚህ መሣሪያ ግብረመልስ ላክ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 612dc1e..b28d0d4 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"تشغيل الشاشة عندما يتم اختيار الجهاز أو وصول إشعارات"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -1233,8 +1234,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"‏وحدة تخزين USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"‏في بطاقة SD"</string>
     <string name="disabled" msgid="9206776641295849915">"معطل"</string>
-    <!-- no translation found for not_installed (2797554494953450291) -->
-    <skip />
+    <string name="not_installed" msgid="2797554494953450291">"لم يتم التثبيت لهذا المستخدم"</string>
     <string name="no_applications" msgid="7336588977497084921">"ليست هناك أية تطبيقات."</string>
     <string name="internal_storage" msgid="1584700623164275282">"وحدة التخزين الداخلية"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"‏وحدة تخزين USB"</string>
@@ -1952,16 +1952,11 @@
     <string name="enter_password" msgid="8035706727471334122">"‏لبدء تشغيل Android، أدخل كلمة المرور"</string>
     <string name="enter_pin" msgid="5305333588093263790">"‏لبدء تشغيل Android، أدخل رقم التعريف الشخصي"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"‏لبدء تشغيل Android، ارسم النقش"</string>
-    <!-- no translation found for cryptkeeper_wrong_pattern (8423835922362956999) -->
-    <skip />
-    <!-- no translation found for cryptkeeper_wrong_password (5200857195368904047) -->
-    <skip />
-    <!-- no translation found for cryptkeeper_wrong_pin (755720788765259382) -->
-    <skip />
-    <!-- no translation found for checking_decryption (8287458611802609493) -->
-    <skip />
-    <!-- no translation found for starting_android (8581493237458496835) -->
-    <skip />
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"نقش خاطئ"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"كلمة مرور خاطئة"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"رقم تعريف شخصي خاطئ"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"جارٍ التحقق…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"‏جارٍ تشغيل Android"</string>
     <string name="delete" msgid="4219243412325163003">"حذف"</string>
     <string name="misc_files" msgid="6720680815969643497">"ملفات متنوعة"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"تم تحديد <xliff:g id="NUMBER">%1$d</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -2338,33 +2333,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"عمليات البحث التي تمت مؤخرًا"</string>
     <string name="search_results_label" msgid="4163304782363526148">"النتائج"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"‏اتصال شبكة واي فاي wi-fi"</string>
-    <!-- no translation found for keywords_more_default_sms_app (895656981962034647) -->
-    <skip />
-    <!-- no translation found for keywords_more_mobile_networks (4939725094449606744) -->
-    <skip />
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"رسالة نصية كتابة رسائل نصية إرسال رسائل"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"‏خلوي مشغِّل شبكة جوّال لاسلكي بيانات 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"شاشة لمس للشاشة"</string>
-    <!-- no translation found for keywords_display_brightness_level (8923289340474728990) -->
-    <skip />
-    <!-- no translation found for keywords_display_auto_brightness (8357056338746666901) -->
-    <skip />
-    <!-- no translation found for keywords_display_wallpaper (6043033055096511751) -->
-    <skip />
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"تعتيم شاشة شاشة لمس بطارية"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"تعتيم شاشة شاشة لمس بطارية"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"خلفية تخصيص التخصيص عرض"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"حجم النص"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"المشروع"</string>
-    <!-- no translation found for keywords_storage (6572905220031852173) -->
-    <skip />
-    <!-- no translation found for keywords_battery (2096185085932675704) -->
-    <skip />
-    <!-- no translation found for keywords_spell_checker (6106749039734174140) -->
-    <skip />
+    <string name="keywords_storage" msgid="6572905220031852173">"مسافة قرص محرك أقراص ثابتة جهاز استخدام"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"شحن استخدام طاقة"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"تهجئة قاموس تدقيق إملائي تصحيح تلقائي"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"أداة تعرف إدخال صوت تحدث لغة بدون استخدام اليدين بدون يدين تعرف كلمة مسيئة صوت سجل بلوتوث سماعة رأس"</string>
-    <!-- no translation found for keywords_text_to_speech_output (392447904221657930) -->
-    <skip />
-    <!-- no translation found for keywords_date_and_time (2631808108134830066) -->
-    <skip />
-    <!-- no translation found for keywords_factory_data_reset (4355133848707691977) -->
-    <skip />
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"تقييم لغة افتراضي يتحدث تحدث تحويل نص إلى كلام إمكانية الوصول قارئ مكفوف"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"ساعة عسكرية"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"محو حذف استرداد مسح إزالة"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"طابعة"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"صفارة مكبر الصوت"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"ممنوع الإزعاج ممنوع المقاطعة مقاطعة"</string>
@@ -2373,8 +2357,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"الدقة"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"الحساب"</string>
     <string name="keywords_users" msgid="4673901601478559100">"تقييد يقيد مقيد"</string>
-    <!-- no translation found for keywords_keyboard_and_ime (5251531893531063855) -->
-    <skip />
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"نص تصحيح صحح صوت اهتزاز تلقائي لغة إيماءة اقتراح يقترح مظهر مسيء كلمة يكتب رمز تعبيري دولي"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"التمرير، كلمة المرور، النمط، رقم التعريف الشخصي"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏إعداد علامة NFC عبر Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"كتابة"</string>
@@ -2472,7 +2455,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> في اليوم التالي"</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="notification_settings_apps_title" msgid="1125354590652967250">"إشعارات التطبيقات"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"إعدادات الإشعارات"</string>
     <string name="device_feedback" msgid="3238056036766293294">"إرسال تعليقات حول هذا الجهاز"</string>
@@ -2480,8 +2468,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"تشغيل"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"إيقاف"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"تثبيت الشاشة"</string>
-    <!-- no translation found for screen_pinning_description (1137904524037468263) -->
-    <skip />
+    <string name="screen_pinning_description" msgid="1137904524037468263">"عندما يتم تمكين هذا الإعداد، يمكنك استخدام تثبيت الشاشة لتظل الشاشة الحالية قيد العرض حتى يتم إلغاء التثبيت.\n\nلاستخدام تثبيت الشاشة:\n\n1. تأكد من تمكين تثبيت الشاشة.\n\n2. افتح الشاشة التي تريد تثبيتها.\n\n3. المس عرض عام.\n\n4. مرر لأعلى والمس رمز مسمار التثبيت."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"المطالبة بنقش إلغاء القفل قبل إزالة التثبيت"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"المطالبة برقم التعريف الشخصي قبل إزالة التثبيت"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"المطالبة بكلمة المرور قبل إزالة التثبيت"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 93b64f8..c616eda 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"Събуждане на екрана при вдигане на устройството или при получаване на известия"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> на следващия ден"</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="notification_settings_apps_title" msgid="1125354590652967250">"Известия за прилож."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки за известяване"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Изпращане на отзиви за устройството"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index c0e7eea..51e4d16 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"ডিভাইস হাতে তুলে নিলে বা বিজ্ঞপ্তি হাজির হলে স্ক্রীন জাগ্রত করুন"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"হরফের আকার"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"হরফের আকার"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"সিম কার্ড লক সেটিংস"</string>
@@ -2470,7 +2471,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> পরের দিন"</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="notification_settings_apps_title" msgid="1125354590652967250">"অ্যাপ বিজ্ঞপ্তিগুলি"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"বিজ্ঞপ্তির সেটিংস"</string>
     <string name="device_feedback" msgid="3238056036766293294">"এই ডিভাইসের সম্পর্কে মতামত পাঠান"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index dfb1e4a..87b1158 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -830,7 +830,8 @@
     <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>
-    <string name="doze_summary" msgid="8300817661725517088">"Activa la pantalla quan s\'agafa el dispositiu o quan arriben notificacions."</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> del dia següent"</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="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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6f83ba20..7fba870 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -623,8 +623,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhledávání"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Rozšířené nastavení"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Připojit k síti"</string>
-    <!-- no translation found for wifi_menu_remember (8814185749388713796) -->
-    <skip />
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Zapamatovat síť"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstranit záznam sítě"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upravit síť"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Zápis na štítek NFC"</string>
@@ -669,14 +668,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(neurčeno)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Uloženo"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Vypnuto"</string>
-    <!-- no translation found for wifi_disabled_network_failure (2364951338436007124) -->
-    <skip />
-    <!-- no translation found for wifi_disabled_wifi_failure (3081668066612876581) -->
-    <skip />
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Selhání konfigurace protokolu IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Selhání připojení Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problém s ověřením"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Mimo dosah"</string>
-    <!-- no translation found for wifi_no_internet (9151470775868728896) -->
-    <skip />
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nebyl zjištěn žádný přístup k internetu, připojení nebude automaticky obnoveno."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozici"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozici)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Zadejte heslo sítě"</string>
@@ -834,7 +830,8 @@
     <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>
-    <string name="doze_summary" msgid="8300817661725517088">"Probudit obrazovku při zvednutí zařízení nebo příjetí oznámení"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -1437,14 +1434,10 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zachytit všechny pakety Bluetooth HCI do souboru"</string>
     <string name="oem_unlock_enable" msgid="6629321276287913315">"Povolit odemknutí OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Povolit, aby zařízení bylo ve stavu odemknutí OEM"</string>
-    <!-- no translation found for oem_unlock_enable_pin_prompt (2398518281753145705) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_pin_description (1373634087885107329) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_title (5704707409461191290) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (3613451506484517501) -->
-    <skip />
+    <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>
+    <string name="confirm_enable_oem_unlock_title" msgid="5704707409461191290">"Upozornění"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"Pokud povolíte odemknutí OEM, budou v tomto zařízení zakázány funkce ochrany před odcizením a může být zneplatněna záruka. Pokračovat?"</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>
@@ -2456,16 +2449,12 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dokud tuto funkci nevypnete"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritní vyrušení"</string>
-    <!-- no translation found for zen_mode_downtime_category (2654477732333340290) -->
-    <skip />
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Výpadek"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dny"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Žádné"</string>
-    <!-- no translation found for zen_mode_downtime_mode_title (7249388756365079715) -->
-    <skip />
-    <!-- no translation found for zen_mode_downtime_mode_priority (1599184173608032994) -->
-    <skip />
-    <!-- no translation found for zen_mode_downtime_mode_none (8572229891146527069) -->
-    <skip />
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Vyrušení jsou povolena"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Pouze prioritní"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Žádné"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizace"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automaticky zapnout"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
@@ -2484,7 +2473,12 @@
     <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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> další den"</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="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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 17fd291..bb1496e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -830,7 +830,8 @@
     <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">"Omgivelsesfarve"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Tænd skærmen, når enheden berøres eller modtager en underretning"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næste dag"</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="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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index cef055f..2baa52c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -831,7 +831,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Zum Aktivieren anheben"</string>
     <string name="doze_title" msgid="2259176504273878294">"Inaktivitätsdisplay"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Bildschirm aktivieren, wenn das Gerät verwendet wird oder eine Benachrichtigung eintrifft"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Schriftgröße"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Einstellungen für SIM-Sperre"</string>
@@ -2473,7 +2474,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Wochentags abends"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Startzeit"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Endzeit"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Am nächsten Tag um <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="notification_settings_apps_title" msgid="1125354590652967250">"App-Benachrichtigungen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Benachrichtigungseinstellungen"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback zu diesem Gerät senden"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c1282d2..aaa4f1c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Σηκώστε για ενεργοποίηση"</string>
     <string name="doze_title" msgid="2259176504273878294">"Οθόνη ambient"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Οθόνη αφύπνισης κατά την επιλογή συσκευής ή την άφιξη ειδοποιήσεων"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2474,7 +2475,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> επόμενη μέρα"</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="notification_settings_apps_title" msgid="1125354590652967250">"Ειδοποιήσεις εφαρμ."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ρυθμίσεις ειδοποιήσεων"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Αποστολή σχολίων για τη συσκευή"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6515ab3..8061dd2 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambient display"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Wake screen when device is picked up or notifications arrive"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Font size"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
@@ -1233,8 +1234,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB storage"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"On SD card"</string>
     <string name="disabled" msgid="9206776641295849915">"Disabled"</string>
-    <!-- no translation found for not_installed (2797554494953450291) -->
-    <skip />
+    <string name="not_installed" msgid="2797554494953450291">"Not installed for this user"</string>
     <string name="no_applications" msgid="7336588977497084921">"No apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB storage"</string>
@@ -1952,16 +1952,11 @@
     <string name="enter_password" msgid="8035706727471334122">"To start Android, enter your password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"To start Android, enter your PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"To start Android, draw your pattern"</string>
-    <!-- no translation found for cryptkeeper_wrong_pattern (8423835922362956999) -->
-    <skip />
-    <!-- no translation found for cryptkeeper_wrong_password (5200857195368904047) -->
-    <skip />
-    <!-- no translation found for cryptkeeper_wrong_pin (755720788765259382) -->
-    <skip />
-    <!-- no translation found for checking_decryption (8287458611802609493) -->
-    <skip />
-    <!-- no translation found for starting_android (8581493237458496835) -->
-    <skip />
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Wrong Pattern"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Wrong Password"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Wrong PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Checking…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Starting Android"</string>
     <string name="delete" msgid="4219243412325163003">"Delete"</string>
     <string name="misc_files" msgid="6720680815969643497">"Misc. files"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -2338,33 +2333,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Recent searches"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Results"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
-    <!-- no translation found for keywords_more_default_sms_app (895656981962034647) -->
-    <skip />
-    <!-- no translation found for keywords_more_mobile_networks (4939725094449606744) -->
-    <skip />
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message texting messages messaging"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobile network mobile operator wireless data 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"screen touchscreen"</string>
-    <!-- no translation found for keywords_display_brightness_level (8923289340474728990) -->
-    <skip />
-    <!-- no translation found for keywords_display_auto_brightness (8357056338746666901) -->
-    <skip />
-    <!-- no translation found for keywords_display_wallpaper (6043033055096511751) -->
-    <skip />
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dim screen touchscreen battery"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dim screen touchscreen battery"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background personalise customise display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"project"</string>
-    <!-- no translation found for keywords_storage (6572905220031852173) -->
-    <skip />
-    <!-- no translation found for keywords_battery (2096185085932675704) -->
-    <skip />
-    <!-- no translation found for keywords_spell_checker (6106749039734174140) -->
-    <skip />
+    <string name="keywords_storage" msgid="6572905220031852173">"space disk hard drive device usage"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"power usage charge"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling dictionary spell check auto-correct"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"recogniser input speech speak language hands-free hand free recognition offensive word audio history bluetooth headset"</string>
-    <!-- no translation found for keywords_text_to_speech_output (392447904221657930) -->
-    <skip />
-    <!-- no translation found for keywords_date_and_time (2631808108134830066) -->
-    <skip />
-    <!-- no translation found for keywords_factory_data_reset (4355133848707691977) -->
-    <skip />
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"rate language default speak speaking tts accessibility reader blind"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"clock military"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"wipe delete restore clear remove"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"speaker beep"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"dont don\'t disturb interrupt interruption break"</string>
@@ -2373,8 +2357,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"accuracy"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restriction restrict restricted"</string>
-    <!-- no translation found for keywords_keyboard_and_ime (5251531893531063855) -->
-    <skip />
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
@@ -2472,7 +2455,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Weeknights"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Start time"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"End time"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</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="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
@@ -2480,8 +2468,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Off"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Screen pinning"</string>
-    <!-- no translation found for screen_pinning_description (1137904524037468263) -->
-    <skip />
+    <string name="screen_pinning_description" msgid="1137904524037468263">"When this setting is turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure that screen pinning is turned on.\n\n2. Open the screen that you want to pin.\n\n3. Touch Overview.\n\n4. Swipe up and then touch the pin icon."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Ask for unlock pattern before unpinning"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 6515ab3..8061dd2 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambient display"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Wake screen when device is picked up or notifications arrive"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Font size"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
@@ -1233,8 +1234,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB storage"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"On SD card"</string>
     <string name="disabled" msgid="9206776641295849915">"Disabled"</string>
-    <!-- no translation found for not_installed (2797554494953450291) -->
-    <skip />
+    <string name="not_installed" msgid="2797554494953450291">"Not installed for this user"</string>
     <string name="no_applications" msgid="7336588977497084921">"No apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB storage"</string>
@@ -1952,16 +1952,11 @@
     <string name="enter_password" msgid="8035706727471334122">"To start Android, enter your password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"To start Android, enter your PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"To start Android, draw your pattern"</string>
-    <!-- no translation found for cryptkeeper_wrong_pattern (8423835922362956999) -->
-    <skip />
-    <!-- no translation found for cryptkeeper_wrong_password (5200857195368904047) -->
-    <skip />
-    <!-- no translation found for cryptkeeper_wrong_pin (755720788765259382) -->
-    <skip />
-    <!-- no translation found for checking_decryption (8287458611802609493) -->
-    <skip />
-    <!-- no translation found for starting_android (8581493237458496835) -->
-    <skip />
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Wrong Pattern"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Wrong Password"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Wrong PIN"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Checking…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Starting Android"</string>
     <string name="delete" msgid="4219243412325163003">"Delete"</string>
     <string name="misc_files" msgid="6720680815969643497">"Misc. files"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -2338,33 +2333,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Recent searches"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Results"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
-    <!-- no translation found for keywords_more_default_sms_app (895656981962034647) -->
-    <skip />
-    <!-- no translation found for keywords_more_mobile_networks (4939725094449606744) -->
-    <skip />
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message texting messages messaging"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobile network mobile operator wireless data 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"screen touchscreen"</string>
-    <!-- no translation found for keywords_display_brightness_level (8923289340474728990) -->
-    <skip />
-    <!-- no translation found for keywords_display_auto_brightness (8357056338746666901) -->
-    <skip />
-    <!-- no translation found for keywords_display_wallpaper (6043033055096511751) -->
-    <skip />
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dim screen touchscreen battery"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dim screen touchscreen battery"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background personalise customise display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"project"</string>
-    <!-- no translation found for keywords_storage (6572905220031852173) -->
-    <skip />
-    <!-- no translation found for keywords_battery (2096185085932675704) -->
-    <skip />
-    <!-- no translation found for keywords_spell_checker (6106749039734174140) -->
-    <skip />
+    <string name="keywords_storage" msgid="6572905220031852173">"space disk hard drive device usage"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"power usage charge"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling dictionary spell check auto-correct"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"recogniser input speech speak language hands-free hand free recognition offensive word audio history bluetooth headset"</string>
-    <!-- no translation found for keywords_text_to_speech_output (392447904221657930) -->
-    <skip />
-    <!-- no translation found for keywords_date_and_time (2631808108134830066) -->
-    <skip />
-    <!-- no translation found for keywords_factory_data_reset (4355133848707691977) -->
-    <skip />
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"rate language default speak speaking tts accessibility reader blind"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"clock military"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"wipe delete restore clear remove"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"speaker beep"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"dont don\'t disturb interrupt interruption break"</string>
@@ -2373,8 +2357,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"accuracy"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restriction restrict restricted"</string>
-    <!-- no translation found for keywords_keyboard_and_ime (5251531893531063855) -->
-    <skip />
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
@@ -2472,7 +2455,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Weeknights"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Start time"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"End time"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</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="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
@@ -2480,8 +2468,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Off"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Screen pinning"</string>
-    <!-- no translation found for screen_pinning_description (1137904524037468263) -->
-    <skip />
+    <string name="screen_pinning_description" msgid="1137904524037468263">"When this setting is turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure that screen pinning is turned on.\n\n2. Open the screen that you want to pin.\n\n3. Touch Overview.\n\n4. Swipe up and then touch the pin icon."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Ask for unlock pattern before unpinning"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b9496d3..9886a49 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -623,8 +623,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Config. avanzada"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar a la red"</string>
-    <!-- no translation found for wifi_menu_remember (8814185749388713796) -->
-    <skip />
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Recordar red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Olvidar red"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar la red"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Escribir en etiqueta NFC"</string>
@@ -669,14 +668,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(sin especificar)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Guardada"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitada"</string>
-    <!-- no translation found for wifi_disabled_network_failure (2364951338436007124) -->
-    <skip />
-    <!-- no translation found for wifi_disabled_wifi_failure (3081668066612876581) -->
-    <skip />
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Error de configuración IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Error de conexión Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticación"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera de alcance"</string>
-    <!-- no translation found for wifi_no_internet (9151470775868728896) -->
-    <skip />
+    <string name="wifi_no_internet" msgid="9151470775868728896">"No se detectó el acceso a Internet. No se volverá a conectar de forma automática."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WSP disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WSP disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ingresa la contraseña de la red."</string>
@@ -834,7 +830,8 @@
     <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>
-    <string name="doze_summary" msgid="8300817661725517088">"Activa la pantalla si se recoge el dispositivo o si llega una notificación."</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -1437,14 +1434,10 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos los paquetes de HCI de Bluetooth en un archivo"</string>
     <string name="oem_unlock_enable" msgid="6629321276287913315">"Habilitar desbloqueo OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Permitir que el dispositivo se desbloquee con OEM"</string>
-    <!-- no translation found for oem_unlock_enable_pin_prompt (2398518281753145705) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_pin_description (1373634087885107329) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_title (5704707409461191290) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (3613451506484517501) -->
-    <skip />
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Ingresa el PIN."</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ingresa el PIN del dispositivo para habilitar el desbloqueo OEM."</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="5704707409461191290">"Advertencia"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"Habilitar el desbloqueo OEM inhabilita las funciones de protección contra robo en este dispositivo y es posible que anule la garantía. ¿Deseas continuar?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificación de pantalla inalámbrica"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Habilitar registro detallado de Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transferencia intensa de Wi‑Fi a celular"</string>
@@ -2456,16 +2449,12 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Listo"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Hasta que lo desactives"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Interrupciones de prioridad"</string>
-    <!-- no translation found for zen_mode_downtime_category (2654477732333340290) -->
-    <skip />
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Tiempo de inactividad"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Días"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ninguno"</string>
-    <!-- no translation found for zen_mode_downtime_mode_title (7249388756365079715) -->
-    <skip />
-    <!-- no translation found for zen_mode_downtime_mode_priority (1599184173608032994) -->
-    <skip />
-    <!-- no translation found for zen_mode_downtime_mode_none (8572229891146527069) -->
-    <skip />
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Permitir interrupciones"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Solo prioridad"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ninguno"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatización"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activar automáticamente"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
@@ -2484,7 +2473,12 @@
     <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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Día siguiente (<xliff:g id="FORMATTED_TIME">%s</xliff:g>)"</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="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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2bfcb65..1878f39 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -830,7 +830,8 @@
     <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>
-    <string name="doze_summary" msgid="8300817661725517088">"Activa la pantalla si se coge el dispositivo o si llega una notificación"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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">"Ajustes de bloqueo tarjeta SIM"</string>
@@ -2472,7 +2473,12 @@
     <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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Día siguiente a las <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Dar tu opinión sobre el dispositivo"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index e43f226..27ae0dd2 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaatne eredus"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Tõstke äratamiseks"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambientne ekraan"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Ekraani aktiveerimine, kui seade võetakse kätte või saabub märguanne"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Fondi suurus"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Fondi suurus"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kaardi luku seaded"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Argiõhtuti"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Algusaeg"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Lõppaeg"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> järgmisel päeval"</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="notification_settings_apps_title" msgid="1125354590652967250">"Rakenduse märguanded"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Märguandeseaded"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Seadme kohta tagasiside saatmine"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index e462bb4..c1b075d 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Distira automatikoa"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktibatu eskuetan hartzen denean"</string>
     <string name="doze_title" msgid="2259176504273878294">"Giroaren araberako pantaila"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Argitu pantaila gailua mugitzen bada edo jakinarazpenak heltzen badira"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Letra-tipoaren tamaina"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Letra-tipoaren tamaina"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM txartelaren blokeo-ezarpenak"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Lanegunetako gauak"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hasiera-ordua"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Amaiera-ordua"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> (hurrengo egunean)"</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="notification_settings_apps_title" msgid="1125354590652967250">"Aplikazioen jakinarazpenak"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Jakinarazpen-ezarpenak"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bidali gailu honi buruzko iritzia"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6324753..6214f93 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -668,14 +668,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(مشخص نشده)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"ذخیره‌شده"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"غیرفعال شد"</string>
-    <!-- no translation found for wifi_disabled_network_failure (2364951338436007124) -->
-    <skip />
-    <!-- no translation found for wifi_disabled_wifi_failure (3081668066612876581) -->
-    <skip />
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏پیکربندی IP انجام نشد"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏اتصال Wi-Fi برقرار نشد"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"مشکل تأیید اعتبار"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"در محدوده نیست"</string>
-    <!-- no translation found for wifi_no_internet (9151470775868728896) -->
-    <skip />
+    <string name="wifi_no_internet" msgid="9151470775868728896">"دسترسی به اینترنت شناسایی نشد، به صورت خودکار وصل نمی‌شود."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS در دسترس است"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS در دسترس است)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"گذرواژه شبکه‌تان را وارد کنید"</string>
@@ -833,7 +830,8 @@
     <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="8300817661725517088">"وقتی دستگاه برداشته می‌شود یا اعلان دریافت می‌شود، صفحه بیدار شود"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"اندازه قلم"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"اندازهٔ قلم"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"تنظیمات قفل سیم کارت"</string>
@@ -1439,7 +1437,7 @@
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"پین خودتان را وارد کنید"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"پین دستگاهتان را وارد کنید تا بازکردن قفل سازنده محصول اصلی را فعال کنید"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="5704707409461191290">"اخطار"</string>
-    <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"فعال کردن باز کردن قفل سازنده محصول اصلی ویژگی‌های ضدسرقت را در این دستگاه غیرفعال می‌کند و شاید ضمانتتان را باطل کند. ادامه می‌دهید؟"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"فعال کردن باز کردن قفل سازنده محصول اصلی، ویژگی‌های ضدسرقت را در این دستگاه غیرفعال می‌کند و شاید ضمانتتان را باطل کند. ادامه می‌دهید؟"</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>
@@ -2475,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> روز بعد"</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="notification_settings_apps_title" msgid="1125354590652967250">"اعلان‌های برنامه"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"تنظیمات اعلان"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ارسال بازخورد درباره این دستگاه"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 2cae0e8..c94dbec 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -830,7 +830,8 @@
     <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>
-    <string name="doze_summary" msgid="8300817661725517088">"Aktivoi näyttö, kun laite otetaan käteen tai ilmoituksia saapuu"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> seuraavana päivä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="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>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 075840e..794ef3d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -830,7 +830,8 @@
     <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>
-    <string name="doze_summary" msgid="8300817661725517088">"Activer l\'écran en cas de déplacement de l\'appareil ou d\'arrivée d\'une notification"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2052,7 +2053,7 @@
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Changer le cycle..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Jour du mois de réinitialisation du cycle utilisation données :"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Aucune donnée utilisée par les applications pendant cette période."</string>
-    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Couleur du texte"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Avant-plan"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Arrière-plan"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"limitée"</string>
     <string name="data_usage_disable_mobile" msgid="2613595056882494652">"Désactiver les données cellulaires?"</string>
@@ -2472,7 +2473,12 @@
     <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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</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="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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e8ea008..e94ebfb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -830,7 +830,8 @@
     <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>
-    <string name="doze_summary" msgid="8300817661725517088">"Activer l\'écran si l\'appareil est déplacé ou si une notification arrive"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</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="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>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index d66f351..8dd1a4d 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -668,14 +668,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(non especificado)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Gardada"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desactivadas"</string>
-    <!-- no translation found for wifi_disabled_network_failure (2364951338436007124) -->
-    <skip />
-    <!-- no translation found for wifi_disabled_wifi_failure (3081668066612876581) -->
-    <skip />
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Erro na configuración IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Erro na conexión wifi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticación"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Non está dentro da zona de cobertura"</string>
-    <!-- no translation found for wifi_no_internet (9151470775868728896) -->
-    <skip />
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Non se detectou acceso a Internet e non se volverá conectar automaticamente."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dispoñible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dispoñible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce o contrasinal da túa rede"</string>
@@ -833,7 +830,8 @@
     <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="8300817661725517088">"Activa a pantalla cando se colle o dispositivo ou cando chegan notificacións"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2475,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do seguinte día"</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="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>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f827e91..c322c39 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"डिवाइस को उठाने या नोटिफिकेशन के आने पर स्‍क्रीन को सक्रिय करें"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"अक्षरों का आकार"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"अक्षरों का आकार"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"सिम कार्ड लॉक सेटिंग"</string>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"अगले दिन <xliff:g id="FORMATTED_TIME">%s</xliff:g> पर"</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="notification_settings_apps_title" msgid="1125354590652967250">"ऐप्स नोटिफिकेशन"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"नोटिफिकेशन सेटिंग"</string>
     <string name="device_feedback" msgid="3238056036766293294">"इस डिवाइस के बारे में फ़ीडबैक भेजें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 228bb1f..583a1a4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -668,14 +668,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nije određeno)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Spremljeno"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Onemogućeno"</string>
-    <!-- no translation found for wifi_disabled_network_failure (2364951338436007124) -->
-    <skip />
-    <!-- no translation found for wifi_disabled_wifi_failure (3081668066612876581) -->
-    <skip />
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Konfiguracija IP-a nije uspjela"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Povezivanje s Wi-Fi-jem nije uspjelo"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem u autentifikaciji"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Nije u rasponu"</string>
-    <!-- no translation found for wifi_no_internet (9151470775868728896) -->
-    <skip />
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Pristup internetu nije otkriven. Nema automatskog ponovnog povezivanja."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite mrežnu zaporku"</string>
@@ -833,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktivacija podizanjem"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambijentalni zaslon"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Aktiviraj zaslon prilikom podizanja uređaja ili kada stigne obavijest"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Veličina fonta"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Postavke zaključavanja SIM kartice"</string>
@@ -2475,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noći radnih dana"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Vrijeme početka"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Vrijeme završetka"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sutra"</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="notification_settings_apps_title" msgid="1125354590652967250">"Obavijest aplikacije"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke obavijesti"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošalji povr. informacije o uređaju"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 7663791..01da2b5 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Felébresztéshez emelje meg"</string>
     <string name="doze_title" msgid="2259176504273878294">"Környezeti kijelző"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Képernyő felébresztése, amikor az eszközt felemelik, vagy ha értesítés érkezik"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Betűméret"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kártya lezárási beállításai"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Hétköznap este"</string>
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> a következő napon"</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="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>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 980a167..6d16d48 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -623,7 +623,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Սկանավորում"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ընդլայնված"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Միանալ ցանցին"</string>
-    <string name="wifi_menu_remember" msgid="8814185749388713796">"Հիշել ցանցը"</string>
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Պահել ցանցը"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Մոռանալ ցանցը"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Փոփոխել ցանցը"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Գրել NFC պիտակում"</string>
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"Միացնել էկրանը, երբ սարքը վերցնում են տեղից կամ ծանուցումներ են ստացվում"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -1233,8 +1234,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB կրիչ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD քարտի վրա"</string>
     <string name="disabled" msgid="9206776641295849915">"Կասեցված է"</string>
-    <!-- no translation found for not_installed (2797554494953450291) -->
-    <skip />
+    <string name="not_installed" msgid="2797554494953450291">"Տեղադրված չէ այս օգտվողի համար"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ծրագրեր չկան"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Ներքին պահոց"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB կրիչ"</string>
@@ -1433,10 +1433,10 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Կորզել բոլոր bluetooth HCI փաթեթները մի ֆայլում"</string>
     <string name="oem_unlock_enable" msgid="6629321276287913315">"Միացնել OEM ապակողպումը"</string>
     <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Թույլ տալ, որ սարքը OEM ապակողպվի"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Մուտքագրեք ձեր PIN-ը"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Մուտքագրեք PIN-ը"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Մուտքագրեք ձեր սարքի PIN-ը՝ OEM ապակողպումն ակտիվացնելու համար:"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="5704707409461191290">"Զգուշացում"</string>
-    <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"OEM ապակողպման ակտիվացումը կթուլացնի սարքի պաշտպանվածությունը գողությունից և կարող է ազդել ձեր երաշխիքի վրա: Ցանկանո՞ւմ եք շարունակել:"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"OEM ապակողպման ակտիվացումը կթուլացնի սարքի պաշտպանվածությունը գողությունից: Արդյունքում սարքի երաշխիքը կարող է չեղյալ համարվել: Ցանկանո՞ւմ եք շարունակել:"</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>
@@ -1952,16 +1952,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Android- մեկնարկի համար մուտքագրեք ձեր գաղտնաբառը"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android- մեկնարկի համար մուտքագրեք ձեր PIN-ը"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android- մեկնարկի համար մուտքագրեք ձեր կաղապարը"</string>
-    <!-- no translation found for cryptkeeper_wrong_pattern (8423835922362956999) -->
-    <skip />
-    <!-- no translation found for cryptkeeper_wrong_password (5200857195368904047) -->
-    <skip />
-    <!-- no translation found for cryptkeeper_wrong_pin (755720788765259382) -->
-    <skip />
-    <!-- no translation found for checking_decryption (8287458611802609493) -->
-    <skip />
-    <!-- no translation found for starting_android (8581493237458496835) -->
-    <skip />
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Նախշը սխալ է"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Գաղտնաբառը սխալ է"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN-ը սխալ է"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Ստուգվում է…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android-ը գործարկվում է"</string>
     <string name="delete" msgid="4219243412325163003">"Ջնջել"</string>
     <string name="misc_files" msgid="6720680815969643497">"Խառը ֆայլեր"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Ընտրված է <xliff:g id="NUMBER">%1$d</xliff:g>-ը <xliff:g id="TOTAL">%2$d</xliff:g>-ից"</string>
@@ -2338,33 +2333,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Վերջին որոնումները"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Արդյունքներ"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ցանցային կապ"</string>
-    <!-- no translation found for keywords_more_default_sms_app (895656981962034647) -->
-    <skip />
-    <!-- no translation found for keywords_more_mobile_networks (4939725094449606744) -->
-    <skip />
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"տեքստային հաղորդագրություն տեքստային հաղորդագրություն գրել հաղորդակցում"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"բջջային բջջային կապ անլար տվյալների կապ 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"թողարկիչ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"հպէկրան"</string>
-    <!-- no translation found for keywords_display_brightness_level (8923289340474728990) -->
-    <skip />
-    <!-- no translation found for keywords_display_auto_brightness (8357056338746666901) -->
-    <skip />
-    <!-- no translation found for keywords_display_wallpaper (6043033055096511751) -->
-    <skip />
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"էկրանի խամրում հպէկրան մարտկոց"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"էկրանի խամրում հպէկրան մարտկոց"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"հետնաշերտ անհատականացնել հարմարեցնել էկրան"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"տեքստի չափը"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"նախագիծ"</string>
-    <!-- no translation found for keywords_storage (6572905220031852173) -->
-    <skip />
-    <!-- no translation found for keywords_battery (2096185085932675704) -->
-    <skip />
-    <!-- no translation found for keywords_spell_checker (6106749039734174140) -->
-    <skip />
+    <string name="keywords_storage" msgid="6572905220031852173">"տարածք սկավառակ կոշտ սկավառակ սարք օգտագործում"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"մարտկոցի օգտագործում լիցքավորում"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"ուղղագրություն բառարան ուղղագրության ստուգում ինքնուղղում"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"ճանաչող մուտքի խոսք խոսքի լեզու անձեռն անձեռն ճանաչում վիրավորական բառ աուդիո պատմություն Bluetooth ականջակալ"</string>
-    <!-- no translation found for keywords_text_to_speech_output (392447904221657930) -->
-    <skip />
-    <!-- no translation found for keywords_date_and_time (2631808108134830066) -->
-    <skip />
-    <!-- no translation found for keywords_factory_data_reset (4355133848707691977) -->
-    <skip />
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"վարկանիշ լեզու կանխադրված խոսել խոսել tts մատչելիություն ընթերցող կույր"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"ժամացույց ռազմական"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"սրբել ջնջել վերականգնել մաքրել հեռացնել"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"տպիչ"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"բարձրախոսի ազդանշան"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"չխանգարել ընդհատել ընդհատում ընդմիջում"</string>
@@ -2373,8 +2357,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"ճշգրտություն"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"հաշիվ"</string>
     <string name="keywords_users" msgid="4673901601478559100">"սահմանափակում սահմանափակել սահմանափակված"</string>
-    <!-- no translation found for keywords_keyboard_and_ime (5251531893531063855) -->
-    <skip />
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"տեքստի ուղղում ճիշտ ձայն թրթռալ ավտոմատ լեզու ժեստի առաջարկ առաջարկ թեմա վիրավորական բառի տեսակ զմայլիկ միջազգային"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"սահեցնել գաղտնաբառ նախշ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Կարգավորել Wi-Fi NFC պիտակը"</string>
     <string name="write_tag" msgid="8571858602896222537">"Գրել"</string>
@@ -2448,10 +2431,10 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Պատրաստ է"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Քանի դեռ չեք անջատել"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Կարևոր ծանուցումներ"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Անջատված"</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>
-    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Ծանուցումները թույլատրվում են"</string>
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Ընդհատումները թույլատրված են"</string>
     <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Միայն կարևորները"</string>
     <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ոչ մեկը"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Ավտոմատացում"</string>
@@ -2472,7 +2455,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> հաջորդ օրը"</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="notification_settings_apps_title" msgid="1125354590652967250">"Ծրագրերի ծանուցումներ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Ուղարկել կարծիք այս սարքի մասին"</string>
@@ -2480,8 +2468,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Միացված"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Անջատված"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ամրակցել էկրանը"</string>
-    <!-- no translation found for screen_pinning_description (1137904524037468263) -->
-    <skip />
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Երբ այս կարգավորումը միացված է, կարող եք օգտագործել էկրանի ամրացումը՝ ընթացիկ էկրանը տեսադաշտում պահելու համար, քանի դեռ չեք ապամրացրել այն:\n\nԷկրանի ամրացումն օգտագործելու համար՝\n\n1. Համոզվեք, որ էկրանի ամրացումը միացված է:\n\n2. Բացեք այն էկրանը, որը ցանկանում եք ամրացնել:\n\n3. Հպեք Համատեսքի կոճակին:\n\n4. Սահեցրեք վերև և հպեք ամրացման պատկերակին:"</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Ապաամրացնելուց առաջ հարցնել ապակողպող նախշը"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ապաամրացնելուց առաջ հարցնել PIN-կոդը"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ապաամրացնելուց առաջ հարցնել գաղտնաբառը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e5562ac..8755294 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angkat untuk membangunkan"</string>
     <string name="doze_title" msgid="2259176504273878294">"Tampilan ruangan"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Nyalakan layar saat perangkat diambil atau ada pemberitahuan"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Ukuran font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukuran font"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setelan kunci kartu SIM"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Malam hari kerja"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Waktu mulai"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Waktu berakhir"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari berikutnya"</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="notification_settings_apps_title" msgid="1125354590652967250">"Pemberitahuan apl"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setelan pemberitahuan"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Kirim masukan tentang perangkat ini"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 3425b82..a1577c7 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Sjálfvirk birtustilling"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lyfta til að vekja"</string>
     <string name="doze_title" msgid="2259176504273878294">"Umhverfisskjár"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Vekja skjáinn þegar tækið er tekið upp eða þegar tilkynningar berast"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Leturstærð"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Leturstærð"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Stillingar SIM-kortaláss"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Á virkum kvöldum"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Upphafstími"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Lokatími"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næsta dag"</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="notification_settings_apps_title" msgid="1125354590652967250">"Forritatilkynningar"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tilkynningastillingar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Senda ábendingar um þetta tæki"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 386b6b8..3e6283b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Solleva per riattivare"</string>
     <string name="doze_title" msgid="2259176504273878294">"Display Ambient"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Riattiva lo schermo al sollevamento del dispositivo o all\'arrivo di notifiche"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Dimensioni carattere"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Impostazioni blocco SIM"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Sere giorni feriali"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ora di inizio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ora di fine"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> giorno successivo"</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="notification_settings_apps_title" msgid="1125354590652967250">"Notifiche app"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Impostazioni di notifica"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Invia feedback sul dispositivo"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 664b799..30abc0b 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"הער את המסך בעת הרמת המכשיר או בעת הגעת הודעות"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> למחרת"</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="notification_settings_apps_title" msgid="1125354590652967250">"הודעות אפליקציה"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרות התראה"</string>
     <string name="device_feedback" msgid="3238056036766293294">"שלח משוב על המכשיר הזה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 76d6a6e..c610b12 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -832,7 +832,8 @@
     <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="8300817661725517088">"端末が取り上げられたとき、または通知を受信したときにスリープ状態から復帰"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2478,7 +2479,12 @@
     <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_summary_format" msgid="1941585278888784451">"次の日の<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="notification_settings_apps_title" msgid="1125354590652967250">"アプリの通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"この端末についてフィードバックを送信"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index a0df1aa..2a74c4a 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"მოწყობილობის აღებისას ან შემომავალი შეტყობინებებისას ეკრანის გამოღვიძება"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> შემდეგი დღე"</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="notification_settings_apps_title" msgid="1125354590652967250">"აპის შეტყობინებები"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"შეტყობინების პარამეტრები"</string>
     <string name="device_feedback" msgid="3238056036766293294">"გამოხმაურება ამ მოწყობილობის შესახებ"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index d2a8094..09794f9 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Aвтоматтық жарықтық"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ояту үшін көтеру"</string>
     <string name="doze_title" msgid="2259176504273878294">"Айналаны көрсету"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Құрылғы тұтқасын алғанда немесе хабарландырулар келгенде экранды ояту"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> келесі күні"</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="notification_settings_apps_title" msgid="1125354590652967250">"Қолданба хабар-лары"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Хабарландыру параметрлері"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Осы құрылғы туралы пікір жіберу"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 47691f2..b18d071 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"អេក្រង់​ភ្ញាក់​នៅ​ពេល​ឧបករណ៍​​ត្រូវ​បាន​ប៉ះ ​ឬ​​មានការ​ជូន​ដំណឹង"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"ទំហំពុម្ពអក្សរ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"ទំហំ​ពុម្ពអក្សរ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"កំណត់​ការ​ចាក់សោ​ស៊ីម​កាត"</string>
@@ -2338,7 +2339,7 @@
     <string name="keywords_display" msgid="6709007669501628320">"អេក្រង់ ប៉ះ​អេក្រង់"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ធ្វើ​ឲ្យ​អេក្រង់​ព្រិល​ពេល​ប៉ះ​ថ្ម"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ធ្វើ​ឲ្យ​អេក្រង់​ព្រិល​ពេល​ប៉ះ​ថ្ម"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ធ្វើ​ផ្ទៃ​ខាង​ក្រោម​តាម​បុគ្គល​ប្ដូរ​ការ​បង្ហាញ​តាម​បំណង"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ធ្វើ​ផ្ទៃ​ខាង​ក្រោយ​តាម​បុគ្គល​ប្ដូរ​ការ​បង្ហាញ​តាម​បំណង"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ទំហំ​អត្ថបទ"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"គម្រោង"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ទំហំ ថាស​រឹង ដ្រាយ ឧបករណ៍ ការ​ប្រើ"</string>
@@ -2346,7 +2347,7 @@
     <string name="keywords_spell_checker" msgid="6106749039734174140">"ប្រកប វចនានុក្រម ពិនិត្យ​អក្ខរាវិរុទ្ធ កែ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"កម្មវិធី​ស្គាល់ ការ​បញ្ចូល ការ​និយាយ និយាយ ភាសា ហេនហ្វ្រី ហេនហ្វ្រី ការ​ស្គាល់ បំពាន ពាក្យ សំឡេង ប្រវត្តិ ប៊្លូធូស កាស"</string>
     <string name="keywords_text_to_speech_output" msgid="392447904221657930">"អត្រា ភាសា លំនាំដើម និយាយ ការ​និយាយ tts ភាព​ងាយស្រួល ​អ្នក​អាន ពិការ"</string>
-    <string name="keywords_date_and_time" msgid="2631808108134830066">"កម្លាំងនាឡិកា"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"កម្លាំង​នាឡិកា"</string>
     <string name="keywords_factory_data_reset" msgid="4355133848707691977">"លុប លុប ស្ដារ​ឡើង​វិញ សម្អាត លុបចេញ"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"ម៉ាស៊ីន​បោះពុម្ព"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"សំឡេង​អូប៉ាល័រ"</string>
@@ -2454,7 +2455,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ថ្ងៃ​បន្ទាប់"</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="notification_settings_apps_title" msgid="1125354590652967250">"ការជូន​ដំណឹងកម្មវិធី"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​កំណត់​ការ​ជូនដំណឹង"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ផ្ដល់​មតិ​ស្ថាបនា​អំពី​ឧបករណ៍​នេះ"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 9f1dbbd..e066b37 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"ಸಾಧನವನ್ನು ಎತ್ತಿದಾಗ ಅಥವಾ ಅಧಿಸೂಚನೆಗಳು ಬಂದಾಗ ಪರದೆಯನ್ನು ಎಚ್ಚರಿಸು"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"ಫಾಂಟ್ ಗಾತ್ರ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"ಫಾಂಟ್ ಗಾತ್ರ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಲಾಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ಮುಂದಿನ ದಿನ"</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="notification_settings_apps_title" msgid="1125354590652967250">"ಅಪ್ಲಿಕೇಶನ್‌ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ಈ ಸಾಧನದ ಕುರಿತು ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಕಳುಹಿಸಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 9926bd8..d5be83a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"기기를 들거나 알림 수신 시 절전 모드 해제"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"다음 날 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="notification_settings_apps_title" msgid="1125354590652967250">"앱 알림"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"알림 설정"</string>
     <string name="device_feedback" msgid="3238056036766293294">"이 기기에 대한 의견 보내기"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index afee45d..45095d3 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -1184,7 +1184,8 @@
     <skip />
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ойготуу үчүн көтөрүү"</string>
     <string name="doze_title" msgid="2259176504273878294">"Градиент дисплейи"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Түзмөк алынганда же эскертмелер келгенде экранды ойготуу"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <!-- no translation found for title_font_size (4405544325522105222) -->
     <skip />
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Тамганын чоңдугу"</string>
@@ -3377,7 +3378,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> кийинки күнү"</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="notification_settings_apps_title" msgid="1125354590652967250">"Колдонмо эскертмелери"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Эскертме жөндөөлөрү"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Бул түзмөк жөнүндө пикир жөнөтүү"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index b73c340..c5eb530 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"​ເປີດ​ໜ້າ​ຈໍ​ເມື່ອ​​ມີ​ການ​ຈ​ັບ​ອຸ​ປະ​ກອນ​ຂຶ້ນ​ມາ ຫຼື​ມີ​ການ​ແຈ້ງ​ເຕືອນ"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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 card"</string>
@@ -2454,7 +2455,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ມື້​ຕໍ່​ໄປ"</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="notification_settings_apps_title" msgid="1125354590652967250">"ການ​ແຈ້ງ​ເຕືອນ​ແອັບຯ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​ການ​ຕັ້ງ​ຄ່າ​ການ​ແຈ້ງ​ເຕືອນ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ສົ່ງ​ຄຳ​ຕິ​ຊົມ​ກ່ຽວ​ກັບ​ອຸ​ປະ​ກອນ​ນີ້"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 70c05b4..e53926c 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis šviesumas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Pakelti ir pažadinti"</string>
     <string name="doze_title" msgid="2259176504273878294">"Aplinkos vaizdas"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Atrakinti ekraną, kai įrenginys paimamas ar gaunamas pranešimas"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Šrifto dydis"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kortelės užrakto nustatymai"</string>
@@ -1233,8 +1234,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB atmintinė"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kortelėje"</string>
     <string name="disabled" msgid="9206776641295849915">"Neleidžiama"</string>
-    <!-- no translation found for not_installed (2797554494953450291) -->
-    <skip />
+    <string name="not_installed" msgid="2797554494953450291">"Neįdiegta šiam naudotojui"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nėra programų"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Vidinė atmint."</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB atmintinė"</string>
@@ -1952,16 +1952,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Jei norite paleisti „Android“, įveskite slaptažodį"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Jei norite paleisti „Android“, įveskite PIN kodą"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Jei norite paleisti „Android“, nupieškite savo šabloną"</string>
-    <!-- no translation found for cryptkeeper_wrong_pattern (8423835922362956999) -->
-    <skip />
-    <!-- no translation found for cryptkeeper_wrong_password (5200857195368904047) -->
-    <skip />
-    <!-- no translation found for cryptkeeper_wrong_pin (755720788765259382) -->
-    <skip />
-    <!-- no translation found for checking_decryption (8287458611802609493) -->
-    <skip />
-    <!-- no translation found for starting_android (8581493237458496835) -->
-    <skip />
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Netinkamas šablonas"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Netinkamas slaptažodis"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Netinkamas PIN kodas"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Tikrinama…"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Paleidžiama „Android“"</string>
     <string name="delete" msgid="4219243412325163003">"Ištrinti"</string>
     <string name="misc_files" msgid="6720680815969643497">"Įvairūs failai"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"pasirinkti (-a) <xliff:g id="NUMBER">%1$d</xliff:g> iš <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -2338,33 +2333,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Paskutinės paieškos"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Rezultatai"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"„Wi-Fi“ tinklo ryšys"</string>
-    <!-- no translation found for keywords_more_default_sms_app (895656981962034647) -->
-    <skip />
-    <!-- no translation found for keywords_more_mobile_networks (4939725094449606744) -->
-    <skip />
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"teksto pranešimas siųsti žinutę pranešimai susirašinėjimas žinutėmis"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilusis mobiliojo ryšio operatorius belaidis ryšys duomenys 4G 3G 2G LTE"</string>
     <string name="keywords_home" msgid="3626170808219458848">"paleidimo priemonė"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekranas jutiklinis ekranas"</string>
-    <!-- no translation found for keywords_display_brightness_level (8923289340474728990) -->
-    <skip />
-    <!-- no translation found for keywords_display_auto_brightness (8357056338746666901) -->
-    <skip />
-    <!-- no translation found for keywords_display_wallpaper (6043033055096511751) -->
-    <skip />
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"pritemdytas ekranas jutiklinis ekranas akumuliatorius"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"pritemdytas ekranas jutiklinis ekranas akumuliatorius"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fonas suasmeninti tinkinti pateikti"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksto dydis"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projektas"</string>
-    <!-- no translation found for keywords_storage (6572905220031852173) -->
-    <skip />
-    <!-- no translation found for keywords_battery (2096185085932675704) -->
-    <skip />
-    <!-- no translation found for keywords_spell_checker (6106749039734174140) -->
-    <skip />
+    <string name="keywords_storage" msgid="6572905220031852173">"vieta diskas standusis diskas įrenginys naudojimas"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"maitinimas naudojimas įkrovimas"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"rašyba žodynas rašybos tikrinimas automatinis pataisymas"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"atpažinimo priemonė įvesties kalba kalbėti laisvų rankų režimas atpažinimas įžeidžiantis žodis garso istorija „Bluetooth“ ausinės"</string>
-    <!-- no translation found for keywords_text_to_speech_output (392447904221657930) -->
-    <skip />
-    <!-- no translation found for keywords_date_and_time (2631808108134830066) -->
-    <skip />
-    <!-- no translation found for keywords_factory_data_reset (4355133848707691977) -->
-    <skip />
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"įvertinti kalba numatytasis kalbėti kalbėjimas TĮK pritaikymas neįgaliesiems skaitytojas aklas"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"laikrodis kariuomenė"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"valyti ištrinti atkurti išvalyti pašalinti"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"spausdintuvas"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"garsiakalbis pyptelėjimas"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"negalima netrukdyti pertraukti nutraukimas nutrūkęs ryšys"</string>
@@ -2373,8 +2357,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"tikslumas"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"paskyra"</string>
     <string name="keywords_users" msgid="4673901601478559100">"apribojimas riboti apribota"</string>
-    <!-- no translation found for keywords_keyboard_and_ime (5251531893531063855) -->
-    <skip />
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teksto pataisymas pataisyti garsas vibruoti automatinis kalba gestas pasiūlyti pasiūlymas tema įžeidžiantis žodis tipas jaustukai tarptautinis"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slysti slaptažodis šablonas PIN kodas"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nustatyti „Wi-Fi“ ALR žymą"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rašyti"</string>
@@ -2472,7 +2455,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Savaitgalių naktimis"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Pradžios laikas"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Pabaigos laikas"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> kitą dieną"</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="notification_settings_apps_title" msgid="1125354590652967250">"Programų pranešimai"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Įspėjimų nustatymai"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Siųsti atsiliepimą apie šį įrenginį"</string>
@@ -2480,8 +2468,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Įjungti"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Išjungti"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ekrano prisegimas"</string>
-    <!-- no translation found for screen_pinning_description (1137904524037468263) -->
-    <skip />
+    <string name="screen_pinning_description" msgid="1137904524037468263">"Įjungę šį nustatymą galite naudoti ekrano prisegimą, kad būtų rodomas dabartinis ekranas, kol jį atsegsite.\n\nKad naudotumėte ekrano prisegimą:\n\n1. Įsitikinkite, kad ši funkcija įjungta.\n\n2. Atidarykite norimą prisegti ekraną.\n\n3. Palieskite „Apžvalga“.\n\n4. Perbraukite aukštyn ir palieskite prisegimo piktogr."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Prašyti atrakinimo piešinio prieš atsegant"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Prašyti PIN kodo prieš atsegant"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Prašyti slaptažodžio prieš atsegant"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3b5e99d..93b0ad6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Pacelt, lai ieslēgtu"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambients displejs"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Aktivizēt ekrānu, kad ierīcē tiek saņemts zvans vai paziņojumi"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Fonta lielums"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kartes bloķēšanas iestatījumi"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Darbadienu naktīs"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Sākuma laiks"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Beigu laiks"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> (nākamajā dienā)"</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="notification_settings_apps_title" msgid="1125354590652967250">"Lietotņu paziņojumi"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paziņojumu iestatījumi"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Sūtīt atsauksmes par šo ierīci"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 1b42c1f..8196379 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"Разбуди го екранот кога ќе се крене уредот или ќе пристигнат известувања"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> следниот ден"</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="notification_settings_apps_title" msgid="1125354590652967250">"Известувања за апли."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Поставки на известувања"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Испрати информации за уредот"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index c84aae6..1f08989 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"ഉപകരണം കൈയ്യിലെടുക്കുമ്പോഴോ അറിയിപ്പുകൾ വരുമ്പോഴോ സ്ക്രീൻ സജീവമാക്കുക"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"ഫോണ്ട് വലുപ്പം"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"ഫോണ്ട് വലുപ്പം"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"സിം കാർഡ് ലോക്ക് ക്രമീകരണങ്ങൾ"</string>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> അടുത്ത ദിവസം"</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="notification_settings_apps_title" msgid="1125354590652967250">"അപ്ലിക്കേഷൻ അറിയിപ്പുകൾ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"അറിയിപ്പ് ക്രമീകരണങ്ങൾ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ഈ ഉപകരണത്തെക്കുറിച്ചുള്ള ഫീഡ്‌ബാക്ക് അയയ്‌ക്കുക"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 70060c1..bd0aeff 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"Төхөөрөмжийг барих эсхүл мэдэгдэл ирэх үед дэлгэцийг сэрээх"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"Дараагийн өдрийн <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="notification_settings_apps_title" msgid="1125354590652967250">"Aпп мэдэгдлүүд"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Мэдэгдлийн тохиргоо"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Энэ төхөөрөмжийн талаар санал илгээх"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index b061b2a..3bf995d 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"डिव्हाइस निवडले जाते किंवा सूचना येतात तेव्हा स्क्रीन सक्रिय करा"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"फॉन्ट आकार"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"फॉन्ट आकार"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"सिम कार्ड लॉक सेटिंग्ज"</string>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> दुसर्‍या दिवशी"</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="notification_settings_apps_title" msgid="1125354590652967250">"अॅप सूचना"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग्ज"</string>
     <string name="device_feedback" msgid="3238056036766293294">"या डिव्हाइस बद्दल अभिप्राय पाठवा"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 1be03e1..04285a0 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"Bangunkan skrin apabila peranti diangkat atau pemberitahuan tiba"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Malam hari bekerja"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Masa mula"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Masa tamat"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari seterusnya"</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="notification_settings_apps_title" msgid="1125354590652967250">"Pemberitahuan apl"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tetapan pemberitahuan"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Hntr mklm balas mngenai peranti ini"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index ffa25db..3217af4 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"ကိရိယာကို ကောက်ယူလိုက်လျှင် သို့မဟုတ် အကြောင်းကြားချက် ရလျှင် မျက်နှာပြင်ကို နှိုးပေးရန်"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"စာလုံးအရွယ်အစား"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"စာလုံးအရွယ်အစား"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ဆင်းကဒ် သော့ချရန်ဆက်တင်များ"</string>
@@ -2473,7 +2474,12 @@
     <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_summary_format" msgid="1941585278888784451">"နောက်နေ့ <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="notification_settings_apps_title" msgid="1125354590652967250">"App အကြောင်းကြားချက်များ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"အကြောင်းကြားချက် ဆက်တင်များ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ဤကိရိယာအတွက် အကြံပြုချက် ပို့ရန်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8cefe45..357527b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -623,8 +623,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skann"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avansert"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Koble til nettverket"</string>
-    <!-- no translation found for wifi_menu_remember (8814185749388713796) -->
-    <skip />
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Husk nettverket"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Slett nettverk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Endre nettverk"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Skriv til NFC-tag"</string>
@@ -831,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktiver enheten med løftebevegelser"</string>
     <string name="doze_title" msgid="2259176504273878294">"Omgivelsesskjerm"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"aktiver skjermen når enheten håndteres eller mottar varsler"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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">"Innstillinger for SIM-kort-lås"</string>
@@ -1434,14 +1434,10 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Samle alle Bluetooth HCI-pakker i en fil"</string>
     <string name="oem_unlock_enable" msgid="6629321276287913315">"Aktiver OEM-opplåsing"</string>
     <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Til at enheten låses opp med OEM"</string>
-    <!-- no translation found for oem_unlock_enable_pin_prompt (2398518281753145705) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_pin_description (1373634087885107329) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_title (5704707409461191290) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (3613451506484517501) -->
-    <skip />
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Tast inn PIN-koden"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Tast inn enhetens PIN-kode for å aktivere OEM-opplåsing"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="5704707409461191290">"Advarsel"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"Hvis du aktiverer OEM-opplåsing, blir tyveribeskyttelsesfunksjonene på enheten deaktivert, og garantien kan blir ugyldiggjort. Vil du fortsette?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Trådløs skjermsertifisering"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktiver detaljert Wi-Fi-loggføring"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiv overføring til Wi-Fi for mobil"</string>
@@ -2453,16 +2449,12 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Ferdig"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Inntil du slår av funksjonen"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioriterte forstyrrelser"</string>
-    <!-- no translation found for zen_mode_downtime_category (2654477732333340290) -->
-    <skip />
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Nedetid"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dager"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Ingen"</string>
-    <!-- no translation found for zen_mode_downtime_mode_title (7249388756365079715) -->
-    <skip />
-    <!-- no translation found for zen_mode_downtime_mode_priority (1599184173608032994) -->
-    <skip />
-    <!-- no translation found for zen_mode_downtime_mode_none (8572229891146527069) -->
-    <skip />
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Avbrudd tillatt"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Bare prioritet"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Ingen"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatisering"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Slå på automatisk"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
@@ -2481,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"Kl. <xliff:g id="FORMATTED_TIME">%s</xliff:g> neste dag"</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="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>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 6f4470e..25504d7 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"जब उपकरणले टिप्छ वा अधिसूचनाहरू आउँछ पर्दा खोल्नुहोस्"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> अर्को दिन"</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="notification_settings_apps_title" msgid="1125354590652967250">"अनुप्रयोग सूचनाहरू"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिङहरू"</string>
     <string name="device_feedback" msgid="3238056036766293294">"उपकरण बारेमा प्रतिक्रिया पठाउनुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 98bc041..a4b01f6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Optillen om te activeren"</string>
     <string name="doze_title" msgid="2259176504273878294">"Omgevingsdisplay"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Scherm activeren als apparaat wordt opgepakt of als er meldingen binnenkomen"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Instellingen SIM-kaartvergrendeling"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Doordeweekse avonden"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttijd"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Eindtijd"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> de volgende dag"</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="notification_settings_apps_title" msgid="1125354590652967250">"App-meldingen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Instellingen voor meldingen"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback sturen over dit apparaat"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b681635..b17cc30 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podnieś, by wybudzić"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ekran dostosowany do otoczenia"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Wybudź ekran po podniesieniu urządzenia lub otrzymaniu powiadomienia"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Rozmiar czcionki"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ustawienia blokady karty SIM"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noce poza weekendem"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Godzina rozpoczęcia"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Godzina zakończenia"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> następnego dnia"</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="notification_settings_apps_title" msgid="1125354590652967250">"Powiadom. aplikacji"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ustawienia powiadomień"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Prześlij opinię o tym urządzeniu"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9a25ac7..70496cb 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ativar ao levantar"</string>
     <string name="doze_title" msgid="2259176504273878294">"Visualização de ambiente"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Reativar ecrã quando se pegar no dispositivo ou forem recebidas notificações"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamanho do tipo de letra"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Definições de bloqueio do cartão SIM"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noites de dias úteis"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de início"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de fim"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</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="notification_settings_apps_title" msgid="1125354590652967250">"Not. da aplicação"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Definições de notificações"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentários do dispositivo"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 5fdbffb..9e72690 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -830,7 +830,8 @@
     <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>
-    <string name="doze_summary" msgid="8300817661725517088">"Ativar a tela quando o dispositivo for manuseado ou receber notificações"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2474,7 +2475,12 @@
     <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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</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="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>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b7f7ab4..18cba17 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -830,7 +830,8 @@
     <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>
-    <string name="doze_summary" msgid="8300817661725517088">"Activează ecranul când dispozitivul este ridicat sau când sosesc notificări"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2473,7 +2474,12 @@
     <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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"A doua zi, la <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 73c2c18..78169f8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"Включать экран, когда приходит новое оповещение или пользователь берет устройство"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"На след. день в <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="notification_settings_apps_title" msgid="1125354590652967250">"Приложения"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки уведомлений"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Отправить отзыв об устройстве"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 001c118..849bbed 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -834,7 +834,8 @@
     <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="8300817661725517088">"උපාංගය ලබාගත් විට හෝ දැනුම්දීම් පැමිණි විට තිරය නැඟිට්ට වන්න"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2488,7 +2489,12 @@
     <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_summary_format" msgid="1941585278888784451">"මීලඟ දිනයේ <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="notification_settings_apps_title" msgid="1125354590652967250">"යෙදුම් දැනුම්දීම්"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"දැනුම්දීම් සැකසීම්"</string>
     <string name="device_feedback" msgid="3238056036766293294">"මෙම උපාංගය පිළිබඳ ප්‍රතිපෝෂණ යවන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4b9c185..1eddae7 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -830,7 +830,8 @@
     <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>
-    <string name="doze_summary" msgid="8300817661725517088">"Prebudiť obrazovku pri zdvihnutí zariadenia alebo pri novom upozornení"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -1434,7 +1435,7 @@
     <string name="oem_unlock_enable" msgid="6629321276287913315">"Povoliť odomknutie OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Povoliť odomknutie zariadenia OEM"</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ť odmknutie OEM, zadajte kód PIN zariadenia"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ak chcete aktivovať odomknutie OEM, zadajte kód PIN zariadenia"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="5704707409461191290">"Upozornenie"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"Ak povolíte odomknutie OEM, na zariadení sa vypnú funkcie na ochranu proti krádeži a môže dôjsť k zrušeniu záruky. Chcete pokračovať?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikácia bezdrôtového displeja"</string>
@@ -2472,7 +2473,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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ďalší deň"</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="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>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 7d5cd8c..6a1cea2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -830,7 +830,8 @@
     <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>
-    <string name="doze_summary" msgid="8300817661725517088">"Preklopi zaslon iz stanja pripravljenosti ob prijemu naprave ali prispetju obvestil"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -1436,7 +1437,7 @@
     <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Vnesite kodo PIN"</string>
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Če želite omogočiti odklepanje OEM, vnesite kodo PIN naprave"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="5704707409461191290">"Opozorilo"</string>
-    <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"Če omogočite odklepanje OEM, s tem onemogočite funkcije zaščite pred krajo v napravi in morda izničite garancijo. Ali želite nadaljevati?"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"Če omogočite odklepanje OEM, onemogočite funkcije zaščite pred krajo v napravi in morda izničite garancijo. Ali želite nadaljevati?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Potrdilo brezžičnega zaslona"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Omogoči podrob. zapis. dnevnika za Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Odločen prehod iz Wi-Fi-ja v mobil. omr."</string>
@@ -2472,7 +2473,12 @@
     <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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> naslednji dan"</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="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>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 1ebe626..7cd7c5f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -668,14 +668,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(није наведено)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Сачувано"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Онемогућено"</string>
-    <!-- no translation found for wifi_disabled_network_failure (2364951338436007124) -->
-    <skip />
-    <!-- no translation found for wifi_disabled_wifi_failure (3081668066612876581) -->
-    <skip />
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP конфигурација је отказала"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi веза је отказала"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем са потврдом аутентичности"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Није у опсегу"</string>
-    <!-- no translation found for wifi_no_internet (9151470775868728896) -->
-    <skip />
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Приступ интернету није откривен, аутоматско повезивање није могуће."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS је доступан"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS је доступан)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Унесите лозинку за мрежу"</string>
@@ -833,7 +830,8 @@
     <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="8300817661725517088">"Буђење екрана када узмете уређај или стигну обавештења"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2475,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> следећег дана"</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="notification_settings_apps_title" msgid="1125354590652967250">"Обавешт. апликација"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Подешавања обавештења"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Шаљи повратне информације о уређају"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index adeab38..47c291c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Gå ur viloläget vid lyft"</string>
     <string name="doze_title" msgid="2259176504273878294">"Omgivningsskärm"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Väck skärm när en enheten upptäcks eller meddelanden kommer"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Teckenstorlek"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Låsinställningar för SIM-kort"</string>
@@ -1233,8 +1234,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
     <string name="disabled" msgid="9206776641295849915">"Inaktiverat"</string>
-    <!-- no translation found for not_installed (2797554494953450291) -->
-    <skip />
+    <string name="not_installed" msgid="2797554494953450291">"Ej installerad för användaren"</string>
     <string name="no_applications" msgid="7336588977497084921">"Inga appar."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
@@ -1952,16 +1952,11 @@
     <string name="enter_password" msgid="8035706727471334122">"Starta Android genom att ange ditt lösenord"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Starta Android genom att ange din pinkod"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Starta Android genom att rita ditt mönster"</string>
-    <!-- no translation found for cryptkeeper_wrong_pattern (8423835922362956999) -->
-    <skip />
-    <!-- no translation found for cryptkeeper_wrong_password (5200857195368904047) -->
-    <skip />
-    <!-- no translation found for cryptkeeper_wrong_pin (755720788765259382) -->
-    <skip />
-    <!-- no translation found for checking_decryption (8287458611802609493) -->
-    <skip />
-    <!-- no translation found for starting_android (8581493237458496835) -->
-    <skip />
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Fel grafiskt lösenord"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Fel lösenord"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Fel pinkod"</string>
+    <string name="checking_decryption" msgid="8287458611802609493">"Kontrollerar …"</string>
+    <string name="starting_android" msgid="8581493237458496835">"Android startas"</string>
     <string name="delete" msgid="4219243412325163003">"Ta bort"</string>
     <string name="misc_files" msgid="6720680815969643497">"Misc-filer"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> av <xliff:g id="TOTAL">%2$d</xliff:g> har valts"</string>
@@ -2338,33 +2333,22 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Senaste sökningar"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultat"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi-nätverksanslutning"</string>
-    <!-- no translation found for keywords_more_default_sms_app (895656981962034647) -->
-    <skip />
-    <!-- no translation found for keywords_more_mobile_networks (4939725094449606744) -->
-    <skip />
+    <string name="keywords_more_default_sms_app" msgid="895656981962034647">"textmeddelande sms:a meddelanden skicka sms"</string>
+    <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobiltelefon mobil operatör trådlös data 4g 3g 2g lte"</string>
     <string name="keywords_home" msgid="3626170808219458848">"översikt"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skärm pekskärm"</string>
-    <!-- no translation found for keywords_display_brightness_level (8923289340474728990) -->
-    <skip />
-    <!-- no translation found for keywords_display_auto_brightness (8357056338746666901) -->
-    <skip />
-    <!-- no translation found for keywords_display_wallpaper (6043033055096511751) -->
-    <skip />
+    <string name="keywords_display_brightness_level" msgid="8923289340474728990">"tona ned skärm pekskärm batteri"</string>
+    <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"tona ned skärm pekskärm batteri"</string>
+    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"bakgrund anpassa skärm"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"textstorlek"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
-    <!-- no translation found for keywords_storage (6572905220031852173) -->
-    <skip />
-    <!-- no translation found for keywords_battery (2096185085932675704) -->
-    <skip />
-    <!-- no translation found for keywords_spell_checker (6106749039734174140) -->
-    <skip />
+    <string name="keywords_storage" msgid="6572905220031852173">"utrymme disk hårddisk enhet användning"</string>
+    <string name="keywords_battery" msgid="2096185085932675704">"energianvändning laddning"</string>
+    <string name="keywords_spell_checker" msgid="6106749039734174140">"stavning ordbok stavningskontroll autokorrigering"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"igenkännare inmatning tal tala språk handsfree hands-free igenkänning stötande ord ljud historik bluetooth mikrofonlurar"</string>
-    <!-- no translation found for keywords_text_to_speech_output (392447904221657930) -->
-    <skip />
-    <!-- no translation found for keywords_date_and_time (2631808108134830066) -->
-    <skip />
-    <!-- no translation found for keywords_factory_data_reset (4355133848707691977) -->
-    <skip />
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"betyg språk standardinställning tala talar tts tillgänglighet läsare blind"</string>
+    <string name="keywords_date_and_time" msgid="2631808108134830066">"klocka 24-timmarsformat"</string>
+    <string name="keywords_factory_data_reset" msgid="4355133848707691977">"rensa radera återställa ta bort"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"skrivare"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"högtalare pip"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"stör inte avbryt avbrott paus"</string>
@@ -2373,8 +2357,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"exakthet"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
     <string name="keywords_users" msgid="4673901601478559100">"begränsning begränsa begränsad"</string>
-    <!-- no translation found for keywords_keyboard_and_ime (5251531893531063855) -->
-    <skip />
+    <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"textkorrigering korrigera ljud vibrera automatiskt språk gest föreslå förslag tema stötande ord skriva emoji internationell"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"dra lösenord mönster pinkod"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ange en NFC-tagg för Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
@@ -2472,7 +2455,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Veckodagskvällar"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttid"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttid"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nästa dag"</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="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>
@@ -2480,8 +2468,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"På"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Av"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fästa skärmen"</string>
-    <!-- no translation found for screen_pinning_description (1137904524037468263) -->
-    <skip />
+    <string name="screen_pinning_description" msgid="1137904524037468263">"När inställningen är aktiverad kan du fästa skärmen så att den visas tills du lossar den igen.\n\nSå här fäster du skärmen:\n\n1. Kontrollera att funktionen är aktiverad.\n\n2. Öppna skärmen som du vill fästa.\n\n3. Tryck på Översikt.\n\n4. Dra uppåt och tryck sedan på nålikonen."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Be om grafiskt lösenordet innan skärmen lossas"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Be om pinkod innan skärmen lossas"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Be om lösenord innan skärmen lossas"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 756c573..b758b21 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -615,8 +615,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tafuta"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Mipangilio ya kina"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Unganisha kwa mtandao"</string>
-    <!-- no translation found for wifi_menu_remember (8814185749388713796) -->
-    <skip />
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Kumbuka mtandao"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Sahau mtandao"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Mtandao umerekebishwa"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Andika kwenye tagi ya NFC"</string>
@@ -661,14 +660,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(haijabainishwa)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Imehifadhiwa"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Imelemazwa"</string>
-    <!-- no translation found for wifi_disabled_network_failure (2364951338436007124) -->
-    <skip />
-    <!-- no translation found for wifi_disabled_wifi_failure (3081668066612876581) -->
-    <skip />
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Haikuweza Kusanidi IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Haikuweza Kuunganisha kwenye WiFi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Tatizo la uthibitishaji"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Haiko karibu"</string>
-    <!-- no translation found for wifi_no_internet (9151470775868728896) -->
-    <skip />
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Hakuna Ufikiaji kwa Intaneti Uliogunduliwa, haitaweza kuunganisha kiotomatiki."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS inapatikana"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS inapatikana"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Weka nenosiri la mtandao wako"</string>
@@ -826,7 +822,8 @@
     <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>
-    <string name="doze_summary" msgid="8300817661725517088">"Anzisha skrini kifaa kinapoinuliwa au arifa zinapowasili"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -1431,14 +1428,10 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Nasa pakiti zote za Bluetooth HCI katika faili"</string>
     <string name="oem_unlock_enable" msgid="6629321276287913315">"Washa kufungua kwa OEM"</string>
     <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Ruhusu kifaa kifunguliwe kwa OEM"</string>
-    <!-- no translation found for oem_unlock_enable_pin_prompt (2398518281753145705) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_pin_description (1373634087885107329) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_title (5704707409461191290) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (3613451506484517501) -->
-    <skip />
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Weka PIN yako"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Weka PIN ya kifaa chako ili uwashe kipengele cha fungua kwa OEM"</string>
+    <string name="confirm_enable_oem_unlock_title" msgid="5704707409461191290">"Onyo"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"Kuwasha kipengele cha fungua kwa OEM huzima vipengele vya ulinzi dhidi ya wizi kwenye kifaa hiki na huenda kukabatilisha dhima yako. Ungependa kuendelea?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Chaguo za cheti cha kuonyesha pasiwaya"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Washa Uwekaji kumbukumbu za WiFi kutumia Sauti"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Ukabidhi kutoka Wifi kwenda Mtandao wa Simu"</string>
@@ -2450,16 +2443,12 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Nimemaliza"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Hadi utakapozima hili"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Kukatizwa na vipaumbele pekee"</string>
-    <!-- no translation found for zen_mode_downtime_category (2654477732333340290) -->
-    <skip />
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Wakati wa hali tuli"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Siku"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Hamna"</string>
-    <!-- no translation found for zen_mode_downtime_mode_title (7249388756365079715) -->
-    <skip />
-    <!-- no translation found for zen_mode_downtime_mode_priority (1599184173608032994) -->
-    <skip />
-    <!-- no translation found for zen_mode_downtime_mode_none (8572229891146527069) -->
-    <skip />
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Makatizo yanaruhusiwa"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Kipaumbele tu"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Hamna"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Uwekaji otomatiki"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Washa kiotomatiki"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
@@ -2478,7 +2467,12 @@
     <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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> siku inayofuata"</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="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>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 742e12c..107966c 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"சாதனத்தை எடுக்கும் போது அல்லது அறிவிப்புகள் வரும் போது திரையை இயக்கும்"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"எழுத்துரு அளவு"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"எழுத்துரு அளவு"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"சிம் கார்டின் பூட்டு அமைப்பு"</string>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"அடுத்த நாள் <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="notification_settings_apps_title" msgid="1125354590652967250">"பயன்பாட்டு அறிவிப்புகள்"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"அறிவிப்பு அமைப்பு"</string>
     <string name="device_feedback" msgid="3238056036766293294">"சாதனம் பற்றி கருத்தை அனுப்பு"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 0e25732..3f678cf 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"పరికరాన్ని చేతిలోకి తీసుకున్నప్పుడు లేదా నోటిఫికేషన్‌లు వచ్చినప్పుడు స్క్రీన్‌ను సక్రియం చేయి"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"ఫాంట్ పరిమాణం"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"ఫాంట్ పరిమాణం"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"సిమ్ కార్డు లాక్ సెట్టింగ్‌లు"</string>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> తదుపరి రోజు"</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="notification_settings_apps_title" msgid="1125354590652967250">"అనువర్తన నోటిఫికేషన్‌లు"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"నోటిఫికేషన్ సెట్టింగ్‌లు"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ఈ పరికరం గురించి అభిప్రాయం పంపండి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 09eeaac..b5f99f0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"ปลุกหน้าจอเมื่อมีการหยิบอุปกรณ์หรือมีการแจ้งเตือน"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"ขนาดอักษร"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"ขนาดตัวอักษร"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"การตั้งค่าการล็อกซิมการ์ด"</string>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ของวันถัดไป"</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="notification_settings_apps_title" msgid="1125354590652967250">"การแจ้งเตือนของแอป"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"การตั้งค่าการแจ้งเตือน"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ส่งความคิดเห็นเกี่ยวกับอุปกรณ์นี้"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 097eb1c..4b68708 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angatin upang paganahin"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambient na display"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Paganahin ang screen kapag kinuha ang device o may dumating na mga notification"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Laki ng font"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Mga setting ng lock ng SIM card"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Mga Weeknight"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Oras ng pagsisimula"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Oras ng pagtatapos"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sa susunod na araw"</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="notification_settings_apps_title" msgid="1125354590652967250">"Notification sa app"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mga setting ng notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Magpadala ng feedback tungkol sa device na ito"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3c40708..2f4f077 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -623,8 +623,7 @@
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tara"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Gelişmiş"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ağa bağlan"</string>
-    <!-- no translation found for wifi_menu_remember (8814185749388713796) -->
-    <skip />
+    <string name="wifi_menu_remember" msgid="8814185749388713796">"Ağı hatırla"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Ağı unut"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ağı değiştir"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC etiketine yaz"</string>
@@ -669,14 +668,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(belirtilmemiş)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Kaydedildi"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Devre dışı"</string>
-    <!-- no translation found for wifi_disabled_network_failure (2364951338436007124) -->
-    <skip />
-    <!-- no translation found for wifi_disabled_wifi_failure (3081668066612876581) -->
-    <skip />
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP Yapılandırma Hatası"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Kablosuz Bağlantı Hatası"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Kimlik doğrulama sorunu"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Kapsama alanı dışında"</string>
-    <!-- no translation found for wifi_no_internet (9151470775868728896) -->
-    <skip />
+    <string name="wifi_no_internet" msgid="9151470775868728896">"İnternet Erişimi algılanmadı, otomatik olarak tekrar bağlanmayacak."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS kullanılabilir"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS kullanılabilir)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ağ şifrenizi girin"</string>
@@ -834,7 +830,8 @@
     <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>
-    <string name="doze_summary" msgid="8300817661725517088">"Cihaz ele alındığında ya da bildirim geldiğinde ekranı uyandır"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -1437,14 +1434,10 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bir dosyadaki tüm Bluetooth HCI paketlerini yakala"</string>
     <string name="oem_unlock_enable" msgid="6629321276287913315">"OEM kilidini açma etkin"</string>
     <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Cihazın OEM kilidinin açılmasına izin ver"</string>
-    <!-- no translation found for oem_unlock_enable_pin_prompt (2398518281753145705) -->
-    <skip />
-    <!-- no translation found for oem_unlock_enable_pin_description (1373634087885107329) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_title (5704707409461191290) -->
-    <skip />
-    <!-- no translation found for confirm_enable_oem_unlock_text (3613451506484517501) -->
-    <skip />
+    <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>
+    <string name="confirm_enable_oem_unlock_title" msgid="5704707409461191290">"Uyarı"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"OEM kilit açma özelliğini etkinleştirmek, bu cihazda hırsızlığa karşı koruma özelliklerini devre dışı bırakır ve garantinizi geçersiz kılabilir. Devam etmek istiyor musunuz?"</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>
@@ -2456,16 +2449,12 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tamam"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Siz bunu kapatana kadar"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Öncelikli kesintiler"</string>
-    <!-- no translation found for zen_mode_downtime_category (2654477732333340290) -->
-    <skip />
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Kesinti"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Gün"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Yok"</string>
-    <!-- no translation found for zen_mode_downtime_mode_title (7249388756365079715) -->
-    <skip />
-    <!-- no translation found for zen_mode_downtime_mode_priority (1599184173608032994) -->
-    <skip />
-    <!-- no translation found for zen_mode_downtime_mode_none (8572229891146527069) -->
-    <skip />
+    <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Kesintilere izin verilir"</string>
+    <string name="zen_mode_downtime_mode_priority" msgid="1599184173608032994">"Yalnızca öncelikli"</string>
+    <string name="zen_mode_downtime_mode_none" msgid="8572229891146527069">"Yok"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Otomasyon"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Otomatik olarak aç"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
@@ -2484,7 +2473,12 @@
     <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>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>, sonraki gü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="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>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6367074..c69226c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -668,14 +668,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(не вказано)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"Збережено"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Вимкнено"</string>
-    <!-- no translation found for wifi_disabled_network_failure (2364951338436007124) -->
-    <skip />
-    <!-- no translation found for wifi_disabled_wifi_failure (3081668066612876581) -->
-    <skip />
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Помилка конфігурації IP-адреси"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Помилка з’єднання Wi-Fi"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблема з автентифікацією"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Не в діапазоні"</string>
-    <!-- no translation found for wifi_no_internet (9151470775868728896) -->
-    <skip />
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Немає доступу до Інтернету. Спроба під’єднання не здійснюватиметься автоматично."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Є доступ до WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" Є доступ до WPS"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Введіть пароль своєї мережі"</string>
@@ -833,7 +830,8 @@
     <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="8300817661725517088">"Активувати екран, коли користувач бере пристрій або коли надходять сповіщення"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2475,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"Наступного дня о <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="notification_settings_apps_title" msgid="1125354590652967250">"Сповіщення додатків"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Налаштування сповіщень"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Надіслати відгук про цей пристрій"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 10b5b53..4390337 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -668,14 +668,11 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(غیر متعینہ)"</string>
     <string name="wifi_remembered" msgid="4955746899347821096">"محفوظ کردیا گیا"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"غیر فعال"</string>
-    <!-- no translation found for wifi_disabled_network_failure (2364951338436007124) -->
-    <skip />
-    <!-- no translation found for wifi_disabled_wifi_failure (3081668066612876581) -->
-    <skip />
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏IP کنفیگریشن کی ناکامی"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏WiFi کنکشن کی ناکامی"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"توثیق کا مسئلہ"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"رینج میں نہیں ہے"</string>
-    <!-- no translation found for wifi_no_internet (9151470775868728896) -->
-    <skip />
+    <string name="wifi_no_internet" msgid="9151470775868728896">"انٹرنیٹ تک کسی رسائی کا پتہ نہیں چلا، خود بخود دوبارہ منسلک نہیں ہوگا۔"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS دستیاب ہے"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS دستیاب ہے)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"اپنا نیٹ ورک پاس ورڈ درج کریں"</string>
@@ -833,7 +830,8 @@
     <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="8300817661725517088">"آلہ اٹھانے یا اطلاعات پہنچنے پر اسکرین کو آن کریں"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2475,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> اگلے دن"</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="notification_settings_apps_title" msgid="1125354590652967250">"ایپ کی اطلاعات"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"اطلاع کی ترتیبات"</string>
     <string name="device_feedback" msgid="3238056036766293294">"اس آلہ کے بارے میں تاثرات بھیجیں"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 6507f5a..3807ddc 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Avtomatik yorqinlik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Tik holatda faollashtirish"</string>
     <string name="doze_title" msgid="2259176504273878294">"Tashqi ekran"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Qurilma qo‘lga olinganda yoki bildirishnoma kelganda ekran uyg‘otilsin"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Shrift xajmi"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Shrift hajmi"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM karta qulfi sozlamalari"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Ish kunlari kechasi"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Boshlanish vaqti"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Tugash vaqti"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Keyingi kun <xliff:g id="FORMATTED_TIME">%s</xliff:g> da"</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="notification_settings_apps_title" msgid="1125354590652967250">"Ilova bildirish-lari"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirishnoma sozlamalari"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Qurilma haqida mulohaza yuborish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index af3aa80..77dbc86 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -598,16 +598,16 @@
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Tránh kết nối kém"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Không sử dụng mạng Wi‑Fi trừ khi mạng này có kết nối Internet tốt"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Chỉ sử dụng mạng có kết nối Internet tốt"</string>
-    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Tùy chọn quét luôn sẵn sàng"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Luôn quét"</string>
     <string name="wifi_scan_always_available_title" msgid="1518769058260729007">"Luôn cho phép quét"</string>
     <string name="wifi_scan_always_available_summary" msgid="5442775583708315387">"Cho phép dịch vụ định vị và các ứng dụng khác của Google quét tìm mạng, ngay cả khi Wi-Fi bị tắt"</string>
     <string name="wifi_automatically_manage_title" msgid="6249976570008992746">"Tự động quản lý Wi-Fi"</string>
     <string name="wifi_automatically_manage_summary" msgid="6952470763378312488">"Cho phép <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> quản lý kết nối Wi‑Fi của bạn"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Cài đặt chứng chỉ"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Để nâng cao độ chính xác và cho các mục đích khác, Google và các ứng dụng khác có thể quét tìm các mạng gần đó, ngay cả khi Wi-Fi bị tắt. Nếu bạn không muốn điều này xảy ra, hãy đi đến Nâng cao &gt; Tùy chọn quét luôn sẵn sàng."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Ứng dụng có thể quét tìm các mạng gần đó, ngay cả khi Wi-Fi bị tắt. Nếu bạn không muốn điều này xảy ra, hãy đi đến Nâng cao &gt; Tùy chọn quét luôn sẵn sàng."</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Để nâng cao độ chính xác và cho các mục đích khác, Google và các ứng dụng khác có thể quét tìm các mạng gần đó, ngay cả khi Wi-Fi bị tắt. Nếu bạn không muốn điều này xảy ra, hãy đi đến Nâng cao &gt; Luôn quét."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Ứng dụng có thể quét tìm các mạng gần đó, ngay cả khi Wi-Fi bị tắt. Nếu bạn không muốn điều này xảy ra, hãy đi đến Nâng cao &gt; Luôn quét."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Không hiển thị nữa"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Giữ kết nối Wi-Fi khi ở chế độ ngủ"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Bật Wi-Fi khi ở chế độ ngủ"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Bật Wi-Fi khi ở chế độ ngủ"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Đã xảy ra sự cố khi thay đổi cài đặt"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Cải thiện hiệu quả"</string>
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Nhấc lên để đánh thức"</string>
     <string name="doze_title" msgid="2259176504273878294">"Màn hình xung quanh"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Đánh thức màn hình khi chạm vào thiết bị hoặc khi có thông báo"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Kích thước phông chữ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Cài đặt khóa thẻ SIM"</string>
@@ -2472,7 +2473,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Buổi tối cuối tuần"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Thời gian bắt đầu"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Thời gian kết thúc"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ngày hôm sau"</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="notification_settings_apps_title" msgid="1125354590652967250">"Thông báo ứng dụng"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Cài đặt thông báo"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Gửi phản hồi về thiết bị này"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index cc315f8..b3ef30c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"拿起设备或收到通知时唤醒屏幕"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2472,7 +2473,12 @@
     <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_summary_format" msgid="1941585278888784451">"次日<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="notification_settings_apps_title" msgid="1125354590652967250">"应用通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知设置"</string>
     <string name="device_feedback" msgid="3238056036766293294">"发送有关此设备的反馈"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 31fccbc..7d88808 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"提起裝置或收到通知時，喚醒螢幕"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -1433,10 +1434,10 @@
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</string>
     <string name="oem_unlock_enable" msgid="6629321276287913315">"啟用 OEM 解鎖"</string>
     <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"允許使用 OEM 解鎖裝置"</string>
-    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"請輸入您的 PIN"</string>
-    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"請輸入您的裝置 PIN，啓用原始設備製造商 (OEM) 解鎖"</string>
+    <string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"請輸入 PIN"</string>
+    <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"請輸入您的裝置 PIN，以啟用原始設備製造商 (OEM) 解鎖"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="5704707409461191290">"警告"</string>
-    <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"啓用原始設備製造商 (OEM) 解鎖，將停用這部裝置上的防盜功能，並可能導致保養失效。是否繼續？"</string>
+    <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"啟用原始設備製造商 (OEM) 解鎖，將停用這部裝置上的防盜功能，並可能導致保養失效。要繼續嗎？"</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>
@@ -2476,7 +2477,12 @@
     <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_summary_format" msgid="1941585278888784451">"下一天 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"傳送您對這部裝置的意見"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 71f4779..76dc06e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -830,7 +830,8 @@
     <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="8300817661725517088">"拾起裝置或收到通知時，喚醒螢幕"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <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>
@@ -2476,7 +2477,12 @@
     <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_summary_format" msgid="1941585278888784451">"隔天 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</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="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"傳送您對這個裝置的意見回饋"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 90c51f4..8e79eb4 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -830,7 +830,8 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ukukhanya okuzenzakalelayo"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ilifti yokuvuka"</string>
     <string name="doze_title" msgid="2259176504273878294">"Isibonisi esi-Ambient"</string>
-    <string name="doze_summary" msgid="8300817661725517088">"Vusa isikrini uma idivayisi iphakanyisiwe noma uma kufika izaziso"</string>
+    <!-- no translation found for doze_summary (7128970177894383698) -->
+    <skip />
     <string name="title_font_size" msgid="4405544325522105222">"Usayizi wefonti"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ubukhulu befonti"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Izilungiselelo zokuvala ikhadi le-SIM"</string>
@@ -2479,7 +2480,12 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Ubusuku baphakathi neviki"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Isikhathi sokuqala"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Isikhathi sokugcina"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> usuku olulandelayo"</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="notification_settings_apps_title" msgid="1125354590652967250">"Izaziso zohlelo lokusebenza"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Izilungiselelo zesaziso"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Thumela impendulo mayelana nale divayisi"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6c75728..d8d442c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1451,10 +1451,12 @@
     <string name="wifi_scan_always_available_title">Always allow scanning</string>
     <!-- Checkbox summary for option to toggle scan always available setting -->
     <string name="wifi_scan_always_available_summary">Let Google\'s location service and other apps scan for networks, even when Wi\u2011Fi is off</string>
-    <!-- Checkbox title for option to Automatically manage Wi\u2011Fi  [CHAR LIMIT=40] -->
-    <string name="wifi_automatically_manage_title">Automatically manage Wi\u2011Fi</string>
-    <!-- Checkbox summary for option to Automatically manage Wi\u2011Fi  [CHAR LIMIT=100] -->
-    <string name="wifi_automatically_manage_summary">Let <xliff:g id="wifi_assistant">%1$s</xliff:g> manage your Wi\u2011Fi connection</string>
+    <!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
+    <string name="wifi_automatically_connect_title">Connect to open Wi\u2011Fi automatically</string>
+    <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
+    <string name="wifi_automatically_connect_summary">Allow a Wi\u2011Fi assistant to automatically rate and connect to open Wi\u2011Fi networks determined to be high quality</string>
+    <!-- Dialog title for option to select an app which connects to open Wi-Fi automatically [CHAR LIMIT=40] -->
+    <string name="wifi_select_assistant_dialog_title">Select a Wi\u2011Fi assistant</string>
     <!-- Preference title for option to install certificates -->
     <string name="wifi_install_credentials">Install certificates</string>
     <string name="wifi_scan_notify_text_location_on">To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available.</string>
@@ -2050,7 +2052,7 @@
     <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
     <string name="doze_title">Ambient display</string>
     <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
-    <string name="doze_summary">Wake screen when device picked up or notifications arrive</string>
+    <string name="doze_summary">Wake screen when you pick up device or receive notifications</string>
     <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
     <string name="title_font_size">Font size</string>
     <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
@@ -5546,6 +5548,8 @@
     <string name="preferred_network_offload_footer">Disable Network Name Broadcast protects from third parties getting access to your network information.</string>
     <!-- Preferred Network offload Popup.  [CHAR LIMIT=100] -->
     <string name="preferred_network_offload_popup">Disabling Network Name Broadcast will prevent automatic connection to hidden networks.</string>
+    <!-- Summary text describing signal strength to the user.  [CHAR LIMIT=60] -->
+    <string name="sim_signal_strength"><xliff:g id="dbm">%1$d</xliff:g> dBm <xliff:g id="asu">%2$d</xliff:g> asu</string>
 
     <!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->
     <string name="sim_pref_divider">Preferred SIM for</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0e83d90..162dced 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -312,6 +312,10 @@
         <item name="android:layout">@layout/apn_preference_layout</item>
     </style>
 
+    <style name="AppListSwitchPreference" parent="@*android:style/Preference.Material.DialogPreference">
+        <item name="android:widgetLayout">@*android:layout/preference_widget_switch</item>
+    </style>
+
     <style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium">
     </style>
 
@@ -341,5 +345,4 @@
     <style name="Widget.TimePicker" parent="@*android:style/Widget.Material.Light.TimePicker">
         <item name="@android:numbersBackgroundColor">@android:color/white</item>
     </style>
-
 </resources>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 2c47c40..45eda60 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -81,12 +81,6 @@
         </PreferenceScreen>
 
         <PreferenceScreen
-                android:key="safetylegal"
-                android:title="@string/settings_safetylegal_title">
-            <intent android:action="android.settings.SAFETY" />
-        </PreferenceScreen>
-
-        <PreferenceScreen
                 android:key="regulatory_info"
                 android:title="@string/regulatory_information">
             <intent android:action="android.settings.SHOW_REGULATORY_INFO" />
diff --git a/res/xml/device_info_sim_status.xml b/res/xml/device_info_sim_status.xml
new file mode 100644
index 0000000..9e9444d
--- /dev/null
+++ b/res/xml/device_info_sim_status.xml
@@ -0,0 +1,80 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/sim_status_title">
+
+    <Preference android:key="operator_name"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_operator"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="signal_strength"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_signal_strength"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="network_type"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_network_type"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="latest_area_info"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_latest_area_info"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="service_state"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_service_state"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="roaming_state"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_roaming"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="data_state"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_data_state"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="number"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_number"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="imei"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_imei"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+    <Preference android:key="imei_sv"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_imei_sv"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/notification_settings.xml b/res/xml/notification_settings.xml
index 3f9b40c..e5dda19 100644
--- a/res/xml/notification_settings.xml
+++ b/res/xml/notification_settings.xml
@@ -27,25 +27,25 @@
         <!-- Media volume -->
         <com.android.settings.notification.VolumeSeekBarPreference
                 android:key="media_volume"
-                android:icon="@drawable/ic_audio_vol_24dp"
+                android:icon="@*android:drawable/ic_audio_vol"
                 android:title="@string/media_volume_option_title" />
 
         <!-- Alarm volume -->
         <com.android.settings.notification.VolumeSeekBarPreference
                 android:key="alarm_volume"
-                android:icon="@drawable/ic_audio_alarm_24dp"
+                android:icon="@*android:drawable/ic_audio_alarm"
                 android:title="@string/alarm_volume_option_title" />
 
         <!-- Ring volume -->
         <com.android.settings.notification.VolumeSeekBarPreference
                 android:key="ring_volume"
-                android:icon="@drawable/ring_notif"
+                android:icon="@*android:drawable/ic_audio_ring_notif"
                 android:title="@string/ring_volume_option_title" />
 
         <!-- Notification volume -->
         <com.android.settings.notification.VolumeSeekBarPreference
                 android:key="notification_volume"
-                android:icon="@drawable/ring_notif"
+                android:icon="@*android:drawable/ic_audio_ring_notif"
                 android:title="@string/notification_volume_option_title" />
 
         <!-- Also vibrate for calls -->
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index 5b81d25..a7f47b1 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -30,11 +30,6 @@
             android:summary="@string/wifi_scan_always_available_summary"
             android:persistent="false" />
 
-    <SwitchPreference
-            android:key="wifi_assistant"
-            android:title="@string/wifi_automatically_manage_title"
-            android:persistent="false" />
-
     <ListPreference
             android:key="sleep_policy"
             android:title="@string/wifi_setting_sleep_policy_title"
@@ -42,6 +37,13 @@
             android:entries="@array/wifi_sleep_policy_entries"
             android:entryValues="@array/wifi_sleep_policy_values" />
 
+    <com.android.settings.AppListSwitchPreference
+            android:key="wifi_assistant"
+            android:title="@string/wifi_automatically_connect_title"
+            android:summary="@string/wifi_automatically_connect_summary"
+            android:dialogTitle="@string/wifi_select_assistant_dialog_title"
+            android:persistent="false" />
+
     <ListPreference
             android:key="frequency_band"
             android:title="@string/wifi_setting_frequency_band_title"
diff --git a/src/com/android/settings/AppListPreference.java b/src/com/android/settings/AppListPreference.java
index 2180983..96897ae 100644
--- a/src/com/android/settings/AppListPreference.java
+++ b/src/com/android/settings/AppListPreference.java
@@ -67,6 +67,11 @@
         }
     }
 
+    public AppListPreference(Context context, AttributeSet attrs,
+            int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
     public AppListPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
@@ -105,6 +110,8 @@
         setEntryValues(packageNames);
         if (selectedIndex != -1) {
             setValueIndex(selectedIndex);
+        } else {
+            setValue(null);
         }
     }
 
diff --git a/src/com/android/settings/AppListSwitchPreference.java b/src/com/android/settings/AppListSwitchPreference.java
new file mode 100644
index 0000000..f9f1ba0
--- /dev/null
+++ b/src/com/android/settings/AppListSwitchPreference.java
@@ -0,0 +1,59 @@
+package com.android.settings;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.Checkable;
+
+/**
+ * A hybrid of AppListPreference and SwitchPreference, representing a preference which can be on or
+ * off but must have a selected value when turned on.
+ *
+ * It is invalid to show this preference when zero valid apps are present.
+ */
+public class AppListSwitchPreference extends AppListPreference {
+    private static final String TAG = "AppListSwitchPref";
+
+    private Checkable mSwitch;
+
+    public AppListSwitchPreference(Context context, AttributeSet attrs) {
+        super(context, attrs, 0, R.style.AppListSwitchPreference);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        mSwitch = (Checkable) view.findViewById(com.android.internal.R.id.switchWidget);
+        mSwitch.setChecked(getValue() != null);
+    }
+
+    @Override
+    protected void showDialog(Bundle state) {
+        if (getValue() != null) {
+            // Turning off the current value.
+            if (callChangeListener(null)) {
+                setValue(null);
+            }
+        } else if (getEntryValues() == null || getEntryValues().length == 0) {
+            Log.e(TAG, "Attempting to show dialog with zero entries: " + getKey());
+        } else if (getEntryValues().length == 1) {
+            // Suppress the dialog and just toggle the preference with the only choice.
+            String value = getEntryValues()[0].toString();
+            if (callChangeListener(value)) {
+                setValue(value);
+            }
+        } else {
+            super.showDialog(state);
+        }
+    }
+
+    @Override
+    public void setValue(String value) {
+        super.setValue(value);
+        if (mSwitch != null) {
+            mSwitch.setChecked(value != null);
+        }
+    }
+}
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 2e917f5..40bed90 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -22,11 +22,13 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.Process;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.security.Credentials;
 import android.security.KeyChain.KeyChainConnection;
@@ -126,8 +128,7 @@
             if (ACTION_RESET.equals(action)) {
                 new ResetDialog();
             } else {
-                if (ACTION_INSTALL.equals(action)
-                        && "com.android.certinstaller".equals(getCallingPackage())) {
+                if (ACTION_INSTALL.equals(action) && checkCallerIsCertInstallerOrSelfInProfile()) {
                     mInstallBundle = intent.getExtras();
                 }
                 // ACTION_UNLOCK also handled here in addition to ACTION_INSTALL
@@ -215,54 +216,74 @@
      * Install credentials if available, otherwise do nothing.
      */
     private void installIfAvailable() {
-        if (mInstallBundle != null && !mInstallBundle.isEmpty()) {
-            Bundle bundle = mInstallBundle;
-            mInstallBundle = null;
-
-            final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, -1);
-
-            if (bundle.containsKey(Credentials.EXTRA_USER_PRIVATE_KEY_NAME)) {
-                String key = bundle.getString(Credentials.EXTRA_USER_PRIVATE_KEY_NAME);
-                byte[] value = bundle.getByteArray(Credentials.EXTRA_USER_PRIVATE_KEY_DATA);
-
-                int flags = KeyStore.FLAG_ENCRYPTED;
-                if (uid == Process.WIFI_UID && isHardwareBackedKey(value)) {
-                    // Hardware backed keystore is secure enough to allow for WIFI stack
-                    // to enable access to secure networks without user intervention
-                    Log.d(TAG, "Saving private key with FLAG_NONE for WIFI_UID");
-                    flags = KeyStore.FLAG_NONE;
-                }
-
-                if (!mKeyStore.importKey(key, value, uid, flags)) {
-                    Log.e(TAG, "Failed to install " + key + " as user " + uid);
-                    return;
-                }
-            }
-
-            int flags = (uid == Process.WIFI_UID) ? KeyStore.FLAG_NONE : KeyStore.FLAG_ENCRYPTED;
-
-            if (bundle.containsKey(Credentials.EXTRA_USER_CERTIFICATE_NAME)) {
-                String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME);
-                byte[] certData = bundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA);
-
-                if (!mKeyStore.put(certName, certData, uid, flags)) {
-                    Log.e(TAG, "Failed to install " + certName + " as user " + uid);
-                    return;
-                }
-            }
-
-            if (bundle.containsKey(Credentials.EXTRA_CA_CERTIFICATES_NAME)) {
-                String caListName = bundle.getString(Credentials.EXTRA_CA_CERTIFICATES_NAME);
-                byte[] caListData = bundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA);
-
-                if (!mKeyStore.put(caListName, caListData, uid, flags)) {
-                    Log.e(TAG, "Failed to install " + caListName + " as user " + uid);
-                    return;
-                }
-            }
-
-            setResult(RESULT_OK);
+        if (mInstallBundle == null || mInstallBundle.isEmpty()) {
+            return;
         }
+
+        Bundle bundle = mInstallBundle;
+        mInstallBundle = null;
+
+        final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, -1);
+
+        if (!UserHandle.isSameUser(uid, Process.myUid())) {
+            int dstUserId = UserHandle.getUserId(uid);
+            int myUserId = UserHandle.myUserId();
+
+            // Restrict install target to the wifi uid.
+            if (uid != Process.WIFI_UID) {
+                Log.e(TAG, "Failed to install credentials as uid " + uid + ": cross-user installs"
+                        + " may only target wifi uids");
+                return;
+            }
+
+            Intent installIntent = new Intent(ACTION_INSTALL)
+                    .setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
+                    .putExtras(bundle);
+            startActivityAsUser(installIntent, new UserHandle(dstUserId));
+            return;
+        }
+
+        if (bundle.containsKey(Credentials.EXTRA_USER_PRIVATE_KEY_NAME)) {
+            String key = bundle.getString(Credentials.EXTRA_USER_PRIVATE_KEY_NAME);
+            byte[] value = bundle.getByteArray(Credentials.EXTRA_USER_PRIVATE_KEY_DATA);
+
+            int flags = KeyStore.FLAG_ENCRYPTED;
+            if (uid == Process.WIFI_UID && isHardwareBackedKey(value)) {
+                // Hardware backed keystore is secure enough to allow for WIFI stack
+                // to enable access to secure networks without user intervention
+                Log.d(TAG, "Saving private key with FLAG_NONE for WIFI_UID");
+                flags = KeyStore.FLAG_NONE;
+            }
+
+            if (!mKeyStore.importKey(key, value, uid, flags)) {
+                Log.e(TAG, "Failed to install " + key + " as uid " + uid);
+                return;
+            }
+        }
+
+        int flags = (uid == Process.WIFI_UID) ? KeyStore.FLAG_NONE : KeyStore.FLAG_ENCRYPTED;
+
+        if (bundle.containsKey(Credentials.EXTRA_USER_CERTIFICATE_NAME)) {
+            String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME);
+            byte[] certData = bundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA);
+
+            if (!mKeyStore.put(certName, certData, uid, flags)) {
+                Log.e(TAG, "Failed to install " + certName + " as uid " + uid);
+                return;
+            }
+        }
+
+        if (bundle.containsKey(Credentials.EXTRA_CA_CERTIFICATES_NAME)) {
+            String caListName = bundle.getString(Credentials.EXTRA_CA_CERTIFICATES_NAME);
+            byte[] caListData = bundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA);
+
+            if (!mKeyStore.put(caListName, caListData, uid, flags)) {
+                Log.e(TAG, "Failed to install " + caListName + " as uid " + uid);
+                return;
+            }
+        }
+
+        setResult(RESULT_OK);
     }
 
     /**
@@ -371,6 +392,42 @@
     }
 
     /**
+     * Check that the caller is either certinstaller or Settings running in a profile of this user.
+     */
+    private boolean checkCallerIsCertInstallerOrSelfInProfile() {
+        if (TextUtils.equals("com.android.certinstaller", getCallingPackage())) {
+            // CertInstaller is allowed to install credentials
+            return true;
+        }
+
+        final int launchedFromUserId;
+        try {
+            int launchedFromUid = android.app.ActivityManagerNative.getDefault()
+                    .getLaunchedFromUid(getActivityToken());
+            if (launchedFromUid == -1) {
+                Log.e(TAG, ACTION_INSTALL + " must be started with startActivityForResult");
+                return false;
+            }
+            if (!UserHandle.isSameApp(launchedFromUid, Process.myUid())) {
+                // Not the same app
+                return false;
+            }
+            launchedFromUserId = UserHandle.getUserId(launchedFromUid);
+        } catch (RemoteException re) {
+            // Error talking to ActivityManager, just give up
+            return false;
+        }
+
+        UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
+        UserInfo parentInfo = userManager.getProfileParent(launchedFromUserId);
+        if (parentInfo == null || parentInfo.id != UserHandle.myUserId()) {
+            // Caller is not running in a profile of this user
+            return false;
+        }
+        return true;
+    }
+
+    /**
      * Confirm existing key guard, returning password via onActivityResult.
      */
     private boolean confirmKeyGuard() {
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 08de3b7..a625b47 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -88,7 +88,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
-import android.telephony.SubInfoRecord;
+import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
@@ -267,7 +267,7 @@
     private MenuItem mMenuSimCards;
     private MenuItem mMenuCellularNetworks;
 
-    private List<SubInfoRecord> mSubInfoList;
+    private List<SubscriptionInfo> mSubInfoList;
     private Map<Integer,String> mMobileTagMap;
 
     /** Flag used to ignore listeners during binding. */
@@ -1130,8 +1130,8 @@
     };
 
     private void handleMultiSimDataDialog() {
-        final SubInfoRecord currentSir = getCurrentTabSubInfo(getActivity());
-        final SubInfoRecord nextSir = SubscriptionManager.getSubInfoForSubscriber(
+        final SubscriptionInfo currentSir = getCurrentTabSubInfo(getActivity());
+        final SubscriptionInfo nextSir = SubscriptionManager.getSubscriptionInfoForSubscriber(
                 SubscriptionManager.getDefaultDataSubId());
 
         if (currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) {
@@ -2339,14 +2339,14 @@
         final ConnectivityManager conn = ConnectivityManager.from(context);
         final TelephonyManager tele = TelephonyManager.from(context);
 
-        final List<SubInfoRecord> subInfoList = SubscriptionManager.getActiveSubInfoList();
+        final List<SubscriptionInfo> subInfoList = SubscriptionManager.getActiveSubscriptionInfoList();
         // No activated Subscription
         if (subInfoList == null) {
             return false;
         }
         // require both supported network and ready SIM
         boolean isReady = true;
-        for (SubInfoRecord subInfo : subInfoList) {
+        for (SubscriptionInfo subInfo : subInfoList) {
             isReady = isReady & tele.getSimState(subInfo.getSimSlotIndex()) == SIM_STATE_READY;
         }
         return conn.isNetworkSupported(TYPE_MOBILE) && isReady;
@@ -2585,9 +2585,9 @@
             }
         };
 
-        private void addMobileTab(Context context, List<SubInfoRecord> subInfoList) {
+        private void addMobileTab(Context context, List<SubscriptionInfo> subInfoList) {
             if (subInfoList != null) {
-                for (SubInfoRecord subInfo : mSubInfoList) {
+                for (SubscriptionInfo subInfo : mSubInfoList) {
                     if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
                         mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
                                 subInfo.getDisplayName()));
@@ -2596,11 +2596,11 @@
             }
         }
 
-        private SubInfoRecord getCurrentTabSubInfo(Context context) {
+        private SubscriptionInfo getCurrentTabSubInfo(Context context) {
             if (mSubInfoList != null && mTabHost != null) {
                 final int currentTagIndex = mTabHost.getCurrentTab();
                 int i = 0;
-                for (SubInfoRecord subInfo : mSubInfoList) {
+                for (SubscriptionInfo subInfo : mSubInfoList) {
                     if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
                         if (i++ == currentTagIndex) {
                             return subInfo;
@@ -2616,12 +2616,12 @@
          * @param subInfoList The subscription Info List
          * @return The map or null if no activated subscription
          */
-        private Map<Integer, String> initMobileTabTag(List<SubInfoRecord> subInfoList) {
+        private Map<Integer, String> initMobileTabTag(List<SubscriptionInfo> subInfoList) {
             Map<Integer, String> map = null;
             if (subInfoList != null) {
                 String mobileTag;
                 map = new HashMap<Integer, String>();
-                for (SubInfoRecord subInfo : subInfoList) {
+                for (SubscriptionInfo subInfo : subInfoList) {
                     mobileTag = TAB_MOBILE + String.valueOf(subInfo.getSubscriptionId());
                     map.put(subInfo.getSubscriptionId(), mobileTag);
                 }
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index aa27e3b..ab39689 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -44,7 +44,7 @@
 import android.service.trust.TrustAgentService;
 import android.telephony.TelephonyManager;
 import android.telephony.SubscriptionManager;
-import android.telephony.SubInfoRecord;
+import android.telephony.SubscriptionInfo;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -336,7 +336,8 @@
                 KEY_TOGGLE_INSTALL_APPLICATIONS);
         mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
         // Side loading of apps.
-        mToggleAppInstallation.setEnabled(mIsPrimary);
+        // Disable for restricted profiles. For others, check if policy disallows it.
+        mToggleAppInstallation.setEnabled(!um.getUserInfo(UserHandle.myUserId()).isRestricted());
         if (um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES)
                 || um.hasUserRestriction(UserManager.DISALLOW_INSTALL_APPS)) {
             mToggleAppInstallation.setEnabled(false);
@@ -371,9 +372,9 @@
      */
     private static boolean isSimReady() {
         int simState = TelephonyManager.SIM_STATE_UNKNOWN;
-        final List<SubInfoRecord> subInfoList = SubscriptionManager.getActiveSubInfoList();
+        final List<SubscriptionInfo> subInfoList = SubscriptionManager.getActiveSubscriptionInfoList();
         if (subInfoList != null) {
-            for (SubInfoRecord subInfo : subInfoList) {
+            for (SubscriptionInfo subInfo : subInfoList) {
                 simState = TelephonyManager.getDefault().getSimState(subInfo.getSimSlotIndex());
                 if((simState != TelephonyManager.SIM_STATE_ABSENT) &&
                             (simState != TelephonyManager.SIM_STATE_UNKNOWN)){
diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java
index 3d66b77..52b48bb 100644
--- a/src/com/android/settings/SettingsLicenseActivity.java
+++ b/src/com/android/settings/SettingsLicenseActivity.java
@@ -16,205 +16,64 @@
 
 package com.android.settings;
 
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.os.SystemProperties;
 import android.text.TextUtils;
 import android.util.Log;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.Toast;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnDismissListener;
-import android.content.res.Configuration;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.zip.GZIPInputStream;
+import java.io.File;
 
 /**
  * The "dialog" that shows from "License" in the Settings app.
  */
 public class SettingsLicenseActivity extends Activity {
-
     private static final String TAG = "SettingsLicenseActivity";
-    private static final boolean LOGV = false || false;
 
     private static final String DEFAULT_LICENSE_PATH = "/system/etc/NOTICE.html.gz";
     private static final String PROPERTY_LICENSE_PATH = "ro.config.license_path";
 
-    private Handler mHandler;
-    private WebView mWebView;
-    private ProgressDialog mSpinnerDlg;
-    private AlertDialog mTextDlg;
-
-    private class LicenseFileLoader implements Runnable {
-
-        private static final String INNER_TAG = "SettingsLicenseActivity.LicenseFileLoader";
-        public static final int STATUS_OK = 0;
-        public static final int STATUS_NOT_FOUND = 1;
-        public static final int STATUS_READ_ERROR = 2;
-        public static final int STATUS_EMPTY_FILE = 3;
-
-        private String mFileName;
-        private Handler mHandler;
-
-        public LicenseFileLoader(String fileName, Handler handler) {
-            mFileName = fileName;
-            mHandler = handler;
-        }
-
-        public void run() {
-
-            int status = STATUS_OK;
-
-            InputStreamReader inputReader = null;
-            StringBuilder data = new StringBuilder(2048);
-            try {
-                char[] tmp = new char[2048];
-                int numRead;
-                if (mFileName.endsWith(".gz")) {
-                    inputReader = new InputStreamReader(
-                        new GZIPInputStream(new FileInputStream(mFileName)));
-                } else {
-                    inputReader = new FileReader(mFileName);
-                }
-
-                while ((numRead = inputReader.read(tmp)) >= 0) {
-                    data.append(tmp, 0, numRead);
-                }
-            } catch (FileNotFoundException e) {
-                Log.e(INNER_TAG, "License HTML file not found at " + mFileName, e);
-                status = STATUS_NOT_FOUND;
-            } catch (IOException e) {
-                Log.e(INNER_TAG, "Error reading license HTML file at " + mFileName, e);
-                status = STATUS_READ_ERROR;
-            } finally {
-                try {
-                    if (inputReader != null) {
-                        inputReader.close();
-                    }
-                } catch (IOException e) {
-                }
-            }
-
-            if ((status == STATUS_OK) && TextUtils.isEmpty(data)) {
-                Log.e(INNER_TAG, "License HTML is empty (from " + mFileName + ")");
-                status = STATUS_EMPTY_FILE;
-            }
-
-            // Tell the UI thread that we are finished.
-            Message msg = mHandler.obtainMessage(status, null);
-            if (status == STATUS_OK) {
-                msg.obj = data.toString();
-            }
-            mHandler.sendMessage(msg);
-        }
-    }
-
-    public SettingsLicenseActivity() {
-        super();
-        mHandler = null;
-        mWebView = null;
-        mSpinnerDlg = null;
-        mTextDlg = null;
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        String fileName = SystemProperties.get(PROPERTY_LICENSE_PATH, DEFAULT_LICENSE_PATH);
-        if (TextUtils.isEmpty(fileName)) {
-            Log.e(TAG, "The system property for the license file is empty.");
+        final String path = SystemProperties.get(PROPERTY_LICENSE_PATH, DEFAULT_LICENSE_PATH);
+        if (TextUtils.isEmpty(path)) {
+            Log.e(TAG, "The system property for the license file is empty");
             showErrorAndFinish();
             return;
         }
 
-        // The activity does not have any view itself,
-        // so set it invisible to avoid displaying the title text in the background.
-        setVisible(false);
-
-        mWebView = new WebView(this);
-
-        mHandler = new Handler() {
-
-            @Override
-            public void handleMessage(Message msg) {
-                super.handleMessage(msg);
-
-                if (msg.what == LicenseFileLoader.STATUS_OK) {
-                    String text = (String) msg.obj;
-                    showPageOfText(text);
-                } else {
-                    showErrorAndFinish();
-                }
-            }
-        };
-
-        CharSequence title = getText(R.string.settings_license_activity_title);
-        CharSequence msg = getText(R.string.settings_license_activity_loading);
-
-        ProgressDialog pd = ProgressDialog.show(this, title, msg, true, false);
-        pd.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-        mSpinnerDlg = pd;
-
-        // Start separate thread to do the actual loading.
-        Thread thread = new Thread(new LicenseFileLoader(fileName, mHandler));
-        thread.start();
-    }
-
-    @Override
-    protected void onDestroy() {
-        if (mTextDlg != null && mTextDlg.isShowing()) {
-            mTextDlg.dismiss();
+        final File file = new File(path);
+        if (!file.exists() || file.length() == 0) {
+            Log.e(TAG, "License file " + path + " does not exist");
+            showErrorAndFinish();
+            return;
         }
-        if (mSpinnerDlg != null && mSpinnerDlg.isShowing()) {
-            mSpinnerDlg.dismiss();
+
+        // Kick off external viewer due to WebView security restrictions; we
+        // carefully point it at HTMLViewer, since it offers to decompress
+        // before viewing.
+        final Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setDataAndType(Uri.fromFile(file), "text/html");
+        intent.putExtra(Intent.EXTRA_TITLE, getString(R.string.settings_license_activity_title));
+        intent.addCategory(Intent.CATEGORY_DEFAULT);
+        intent.setPackage("com.android.htmlviewer");
+
+        try {
+            startActivity(intent);
+            finish();
+        } catch (ActivityNotFoundException e) {
+            Log.e(TAG, "Failed to find viewer", e);
+            showErrorAndFinish();
         }
-        super.onDestroy();
-    }
-
-    private void showPageOfText(String text) {
-        // Create an AlertDialog to display the WebView in.
-        AlertDialog.Builder builder = new AlertDialog.Builder(SettingsLicenseActivity.this);
-        builder.setCancelable(true)
-               .setView(mWebView)
-               .setTitle(R.string.settings_license_activity_title);
-
-        mTextDlg = builder.create();
-        mTextDlg.setOnDismissListener(new OnDismissListener() {
-
-            public void onDismiss(DialogInterface dlgi) {
-                SettingsLicenseActivity.this.finish();
-            }
-        });
-
-        // Begin the loading.  This will be done in a separate thread in WebView.
-        mWebView.loadDataWithBaseURL(null, text, "text/html", "utf-8", null);
-        mWebView.setWebViewClient(new WebViewClient() {
-            @Override
-            public void onPageFinished(WebView view, String url) {
-                mSpinnerDlg.dismiss();
-                if (SettingsLicenseActivity.this.isResumed()) {
-                    mTextDlg.show();
-                }
-            }
-        });
-
-        mWebView = null;
     }
 
     private void showErrorAndFinish() {
-        mSpinnerDlg.dismiss();
-        mSpinnerDlg = null;
         Toast.makeText(this, R.string.settings_license_activity_unavailable, Toast.LENGTH_LONG)
                 .show();
         finish();
diff --git a/src/com/android/settings/SettingsSafetyLegalActivity.java b/src/com/android/settings/SettingsSafetyLegalActivity.java
deleted file mode 100644
index 368ee1d..0000000
--- a/src/com/android/settings/SettingsSafetyLegalActivity.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.SystemProperties;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.view.KeyEvent;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import com.android.internal.app.AlertActivity;
-import com.android.internal.app.AlertController;
-import android.content.DialogInterface;
-
-/**
- * The "dialog" that shows from "Safety information" in the Settings app.
- */
-public class SettingsSafetyLegalActivity extends AlertActivity 
-        implements DialogInterface.OnCancelListener, DialogInterface.OnClickListener {
-    private static final String PROPERTY_LSAFETYLEGAL_URL = "ro.url.safetylegal";
-
-    private WebView mWebView;
-
-    private AlertDialog mErrorDialog = null;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        String userSafetylegalUrl = SystemProperties.get(PROPERTY_LSAFETYLEGAL_URL);
-
-        final Configuration configuration = getResources().getConfiguration();
-        final String language = configuration.locale.getLanguage();
-        final String country = configuration.locale.getCountry();
-
-        String loc = String.format("locale=%s-%s", language, country);
-
-        userSafetylegalUrl = String.format("%s&%s", userSafetylegalUrl, loc);
-
-        mWebView = new WebView(this);
-
-        // Begin accessing
-        mWebView.getSettings().setJavaScriptEnabled(true);
-        if (savedInstanceState == null) {
-            mWebView.loadUrl(userSafetylegalUrl);
-        } else {
-            mWebView.restoreState(savedInstanceState);
-        }
-        mWebView.setWebViewClient(new WebViewClient() {
-            @Override
-            public void onPageFinished(WebView view, String url) {
-                // Change from 'Loading...' to the real title
-                mAlert.setTitle(getString(R.string.settings_safetylegal_activity_title));
-            }
-
-            @Override
-            public void onReceivedError(WebView view, int errorCode,
-                    String description, String failingUrl) {
-                showErrorAndFinish(failingUrl);
-            }
-        });
-
-        final AlertController.AlertParams p = mAlertParams;
-        p.mTitle = getString(R.string.settings_safetylegal_activity_loading);
-        p.mView = mWebView;
-        p.mForceInverseBackground = true;
-        setupAlert();
-    }
-
-    private void showErrorAndFinish(String url) {
-        if (mErrorDialog == null) {
-            mErrorDialog = new AlertDialog.Builder(this)
-                    .setTitle(R.string.settings_safetylegal_activity_title)
-                    .setPositiveButton(android.R.string.ok, this)
-                    .setOnCancelListener(this)
-                    .setCancelable(true)
-                    .create();
-        } else {
-            if (mErrorDialog.isShowing()) {
-                mErrorDialog.dismiss();
-            }
-        }
-        mErrorDialog.setMessage(getResources()
-                .getString(R.string.settings_safetylegal_activity_unreachable, url));
-        mErrorDialog.show();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        if (mErrorDialog != null) {
-            mErrorDialog.dismiss();
-            mErrorDialog = null;
-        }
-    }
-
-    @Override
-    public boolean dispatchKeyEvent(KeyEvent event) {
-        if (event.getKeyCode() == KeyEvent.KEYCODE_BACK 
-                && event.getAction() == KeyEvent.ACTION_DOWN) {
-            if (mWebView.canGoBack()) {
-                mWebView.goBack();
-                return true;
-            }
-        }
-        return super.dispatchKeyEvent(event);
-    }
-
-    public void onClick(DialogInterface dialog, int whichButton) {
-        finish();
-    }
-
-    public void onCancel(DialogInterface dialog) {
-        finish();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle icicle) {
-        mWebView.saveState(icicle);
-        super.onSaveInstanceState(icicle);
-    }
-}
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index c611772..230bbb2 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -16,11 +16,7 @@
 
 package com.android.settings;
 
-import com.android.settings.wifi.WifiApEnabler;
-import com.android.settings.wifi.WifiApDialog;
-
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothPan;
@@ -31,7 +27,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
-import android.content.res.AssetManager;
 import android.hardware.usb.UsbManager;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiConfiguration;
@@ -44,16 +39,13 @@
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
-import android.text.TextUtils;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.webkit.WebView;
 import android.widget.TextView;
 
-import java.io.InputStream;
+import com.android.settings.wifi.WifiApDialog;
+import com.android.settings.wifi.WifiApEnabler;
+
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.Locale;
 
 /*
  * Displays preferences for Tethering.
@@ -69,7 +61,6 @@
 
     private static final int DIALOG_AP_SETTINGS = 1;
 
-    private WebView mView;
     private SwitchPreference mUsbTether;
 
     private WifiApEnabler mWifiApEnabler;
@@ -182,8 +173,6 @@
 
         mProvisionApp = getResources().getStringArray(
                 com.android.internal.R.array.config_mobile_hotspot_provision_app);
-
-        mView = new WebView(activity);
     }
 
     @Override
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index e150d75..e687beb 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -60,7 +60,7 @@
 import android.provider.ContactsContract.Profile;
 import android.provider.ContactsContract.RawContacts;
 import android.service.persistentdata.PersistentDataBlockManager;
-import android.telephony.SubInfoRecord;
+import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
@@ -988,12 +988,13 @@
      * finds a record with subId.
      * Since the number of SIMs are few, an array is fine.
      */
-    public static SubInfoRecord findRecordBySubId(final int subId) {
-        final List<SubInfoRecord> subInfoList = SubscriptionManager.getActiveSubInfoList();
+    public static SubscriptionInfo findRecordBySubId(final int subId) {
+        final List<SubscriptionInfo> subInfoList =
+                SubscriptionManager.getActiveSubscriptionInfoList();
         final int subInfoLength = subInfoList.size();
 
         for (int i = 0; i < subInfoLength; ++i) {
-            final SubInfoRecord sir = subInfoList.get(i);
+            final SubscriptionInfo sir = subInfoList.get(i);
             if (sir != null && sir.getSubscriptionId() == subId) {
                 return sir;
             }
@@ -1006,12 +1007,13 @@
      * finds a record with slotId.
      * Since the number of SIMs are few, an array is fine.
      */
-    public static SubInfoRecord findRecordBySlotId(final int slotId) {
-        final List<SubInfoRecord> subInfoList = SubscriptionManager.getActiveSubInfoList();
+    public static SubscriptionInfo findRecordBySlotId(final int slotId) {
+        final List<SubscriptionInfo> subInfoList =
+                SubscriptionManager.getActiveSubscriptionInfoList();
         final int subInfoLength = subInfoList.size();
 
         for (int i = 0; i < subInfoLength; ++i) {
-            final SubInfoRecord sir = subInfoList.get(i);
+            final SubscriptionInfo sir = subInfoList.get(i);
             if (sir.getSimSlotIndex() == slotId) {
                 //Right now we take the first subscription on a SIM.
                 return sir;
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index d51610d..12a63e6 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -258,7 +258,7 @@
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
         // Note that this also counts accounts that are not currently displayed
-        boolean syncActive = ContentResolver.getCurrentSyncsAsUser(
+        boolean syncActive = !ContentResolver.getCurrentSyncsAsUser(
                 mUserHandle.getIdentifier()).isEmpty();
         menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive);
         menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive);
@@ -367,6 +367,7 @@
     protected void onSyncStateUpdated() {
         if (!isResumed()) return;
         setFeedsState();
+        getActivity().invalidateOptionsMenu();
     }
 
     private void setFeedsState() {
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 00a7a7f..ef3e40b 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -28,7 +28,6 @@
 import android.content.SyncStatusInfo;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
@@ -84,6 +83,7 @@
     // If an account type is set, then show only accounts of that type
     private String mAccountType;
     // Temporary hack, to deal with backward compatibility 
+    // mFirstAccount is used for the injected preferences
     private Account mFirstAccount;
 
     @Override
@@ -170,11 +170,9 @@
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        MenuItem syncNow = menu.add(0, MENU_SYNC_NOW_ID, 0,
-                getString(R.string.sync_menu_sync_now))
+        menu.add(0, MENU_SYNC_NOW_ID, 0, getString(R.string.sync_menu_sync_now))
                 .setIcon(R.drawable.ic_menu_refresh_holo_dark);
-        MenuItem syncCancel = menu.add(0, MENU_SYNC_CANCEL_ID, 0,
-                getString(R.string.sync_menu_sync_cancel))
+        menu.add(0, MENU_SYNC_CANCEL_ID, 0, getString(R.string.sync_menu_sync_cancel))
                 .setIcon(com.android.internal.R.drawable.ic_menu_close_clear_cancel);
         super.onCreateOptionsMenu(menu, inflater);
     }
@@ -182,10 +180,10 @@
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        boolean syncActive = ContentResolver.getCurrentSyncsAsUser(
+        boolean syncActive = !ContentResolver.getCurrentSyncsAsUser(
                 mUserHandle.getIdentifier()).isEmpty();
-        menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive && mFirstAccount != null);
-        menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive && mFirstAccount != null);
+        menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive);
+        menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive);
     }
 
     @Override
@@ -233,6 +231,7 @@
     @Override
     protected void onSyncStateUpdated() {
         showSyncState();
+        getActivity().invalidateOptionsMenu();
     }
 
     /**
@@ -380,7 +379,6 @@
                 getPreferenceScreen().addPreference(preference);
                 if (mFirstAccount == null) {
                     mFirstAccount = account;
-                    getActivity().invalidateOptionsMenu();
                 }
             }
         }
diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java
index 4a3cef3..921ef8e 100644
--- a/src/com/android/settings/deviceinfo/ImeiInformation.java
+++ b/src/com/android/settings/deviceinfo/ImeiInformation.java
@@ -24,7 +24,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.telephony.SubInfoRecord;
+import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
@@ -101,7 +101,7 @@
     }
 
     private Phone getPhoneFromSlotId(int slotId) {
-        final List<SubInfoRecord> subInfos = SubscriptionManager.getSubInfoUsingSlotId(slotId);
+        final List<SubscriptionInfo> subInfos = SubscriptionManager.getSubscriptionInfoUsingSlotId(slotId);
 
         if (subInfos == null || subInfos.size() < 1) {
             return null;
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
new file mode 100644
index 0000000..46addf3
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -0,0 +1,413 @@
+/*
+ * 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.deviceinfo;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.telephony.CellBroadcastMessage;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.PhoneStateListener;
+import android.telephony.ServiceState;
+import android.telephony.SignalStrength;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.internal.telephony.DefaultPhoneNotifier;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneFactory;
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+import android.view.View;
+import android.widget.ListView;
+import android.widget.TabHost;
+import android.widget.TabHost.OnTabChangeListener;
+import android.widget.TabHost.TabContentFactory;
+import android.widget.TabHost.TabSpec;
+import android.widget.TabWidget;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Display the following information
+ * # Phone Number
+ * # Network
+ * # Roaming
+ * # Device Id (IMEI in GSM and MEID in CDMA)
+ * # Network type
+ * # Operator info (area info cell broadcast for Brazil)
+ * # Signal Strength
+ *
+ */
+public class SimStatus extends PreferenceActivity {
+    private static final String TAG = "SimStatus";
+
+    private static final String KEY_DATA_STATE = "data_state";
+    private static final String KEY_SERVICE_STATE = "service_state";
+    private static final String KEY_OPERATOR_NAME = "operator_name";
+    private static final String KEY_ROAMING_STATE = "roaming_state";
+    private static final String KEY_NETWORK_TYPE = "network_type";
+    private static final String KEY_LATEST_AREA_INFO = "latest_area_info";
+    private static final String KEY_PHONE_NUMBER = "number";
+    private static final String KEY_SIGNAL_STRENGTH = "signal_strength";
+    private static final String KEY_IMEI = "imei";
+    private static final String KEY_IMEI_SV = "imei_sv";
+    private static final String COUNTRY_ABBREVIATION_BRAZIL = "br";
+
+    static final String CB_AREA_INFO_RECEIVED_ACTION =
+            "android.cellbroadcastreceiver.CB_AREA_INFO_RECEIVED";
+
+    static final String GET_LATEST_CB_AREA_INFO_ACTION =
+            "android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO";
+
+    // Require the sender to have this permission to prevent third-party spoofing.
+    static final String CB_AREA_INFO_SENDER_PERMISSION =
+            "android.permission.RECEIVE_EMERGENCY_BROADCAST";
+
+
+    private TelephonyManager mTelephonyManager;
+    private Phone mPhone = null;
+    private Resources mRes;
+    private Preference mSignalStrength;
+    private SubscriptionInfo mSir;
+    private boolean mShowLatestAreaInfo;
+
+    // Default summary for items
+    private String mDefaultText;
+
+    private TabHost mTabHost;
+    private TabWidget mTabWidget;
+    private ListView mListView;
+    private List<SubscriptionInfo> mSelectableSubInfos;
+
+    private PhoneStateListener mPhoneStateListener;
+    private BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (CB_AREA_INFO_RECEIVED_ACTION.equals(action)) {
+                Bundle extras = intent.getExtras();
+                if (extras == null) {
+                    return;
+                }
+                CellBroadcastMessage cbMessage = (CellBroadcastMessage) extras.get("message");
+                if (cbMessage != null
+                        && cbMessage.getServiceCategory() == 50
+                        && mSir.getSubscriptionId() == cbMessage.getSubId()) {
+                    String latestAreaInfo = cbMessage.getMessageBody();
+                    updateAreaInfo(latestAreaInfo);
+                }
+            }
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
+        mTelephonyManager = (TelephonyManager)getSystemService(TELEPHONY_SERVICE);
+
+        addPreferencesFromResource(R.xml.device_info_sim_status);
+
+        mRes = getResources();
+        mDefaultText = mRes.getString(R.string.device_info_default);
+        // Note - missing in zaku build, be careful later...
+        mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
+
+        for (int i = 0; i < mTelephonyManager.getSimCount(); i++) {
+            final SubscriptionInfo sir = Utils.findRecordBySlotId(i);
+            if (sir != null) {
+                mSelectableSubInfos.add(sir);
+            }
+        }
+
+        mSir = mSelectableSubInfos.get(0);
+        if (mSelectableSubInfos.size() > 1) {
+            setContentView(R.layout.sim_information);
+
+            mTabHost = (TabHost) findViewById(android.R.id.tabhost);
+            mTabWidget = (TabWidget) findViewById(android.R.id.tabs);
+            mListView = (ListView) findViewById(android.R.id.list);
+
+            mTabHost.setup();
+            mTabHost.setOnTabChangedListener(mTabListener);
+            mTabHost.clearAllTabs();
+
+            for (int i = 0; i < mSelectableSubInfos.size(); i++) {
+                mTabHost.addTab(buildTabSpec(String.valueOf(i),
+                        String.valueOf(mSelectableSubInfos.get(i).getDisplayName())));
+            }
+        }
+
+        updatePhoneInfos();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (mPhone != null) {
+            updatePreference();
+
+            updateSignalStrength(mPhone.getSignalStrength());
+            updateServiceState(mPhone.getServiceState());
+            updateDataState();
+            mTelephonyManager.listen(mPhoneStateListener,
+                    PhoneStateListener.LISTEN_DATA_CONNECTION_STATE
+                    | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS
+                    | PhoneStateListener.LISTEN_SERVICE_STATE);
+            if (mShowLatestAreaInfo) {
+                registerReceiver(mAreaInfoReceiver, new IntentFilter(CB_AREA_INFO_RECEIVED_ACTION),
+                        CB_AREA_INFO_SENDER_PERMISSION, null);
+                // Ask CellBroadcastReceiver to broadcast the latest area info received
+                Intent getLatestIntent = new Intent(GET_LATEST_CB_AREA_INFO_ACTION);
+                sendBroadcastAsUser(getLatestIntent, UserHandle.ALL,
+                        CB_AREA_INFO_SENDER_PERMISSION);
+            }
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        if (mPhone != null) {
+            mTelephonyManager.listen(mPhoneStateListener,
+                    PhoneStateListener.LISTEN_NONE);
+        }
+        if (mShowLatestAreaInfo) {
+            unregisterReceiver(mAreaInfoReceiver);
+        }
+    }
+
+    /**
+     * Removes the specified preference, if it exists.
+     * @param key the key for the Preference item
+     */
+    private void removePreferenceFromScreen(String key) {
+        Preference pref = findPreference(key);
+        if (pref != null) {
+            getPreferenceScreen().removePreference(pref);
+        }
+    }
+
+    private void setSummaryText(String key, String text) {
+        if (TextUtils.isEmpty(text)) {
+            text = mDefaultText;
+        }
+        // some preferences may be missing
+        final Preference preference = findPreference(key);
+        if (preference != null) {
+            preference.setSummary(text);
+        }
+    }
+
+    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()));
+        }
+        setSummaryText(KEY_NETWORK_TYPE, networktype);
+    }
+
+    private void updateDataState() {
+        final int state =
+                DefaultPhoneNotifier.convertDataState(mPhone.getDataConnectionState());
+
+        String display = mRes.getString(R.string.radioInfo_unknown);
+
+        switch (state) {
+            case TelephonyManager.DATA_CONNECTED:
+                display = mRes.getString(R.string.radioInfo_data_connected);
+                break;
+            case TelephonyManager.DATA_SUSPENDED:
+                display = mRes.getString(R.string.radioInfo_data_suspended);
+                break;
+            case TelephonyManager.DATA_CONNECTING:
+                display = mRes.getString(R.string.radioInfo_data_connecting);
+                break;
+            case TelephonyManager.DATA_DISCONNECTED:
+                display = mRes.getString(R.string.radioInfo_data_disconnected);
+                break;
+        }
+
+        setSummaryText(KEY_DATA_STATE, display);
+    }
+
+    private void updateServiceState(ServiceState serviceState) {
+        final int state = serviceState.getState();
+        String display = mRes.getString(R.string.radioInfo_unknown);
+
+        switch (state) {
+            case ServiceState.STATE_IN_SERVICE:
+                display = mRes.getString(R.string.radioInfo_service_in);
+                break;
+            case ServiceState.STATE_OUT_OF_SERVICE:
+            case ServiceState.STATE_EMERGENCY_ONLY:
+                display = mRes.getString(R.string.radioInfo_service_out);
+                break;
+            case ServiceState.STATE_POWER_OFF:
+                display = mRes.getString(R.string.radioInfo_service_off);
+                break;
+        }
+
+        setSummaryText(KEY_SERVICE_STATE, display);
+
+        if (serviceState.getRoaming()) {
+            setSummaryText(KEY_ROAMING_STATE, mRes.getString(R.string.radioInfo_roaming_in));
+        } else {
+            setSummaryText(KEY_ROAMING_STATE, mRes.getString(R.string.radioInfo_roaming_not));
+        }
+        setSummaryText(KEY_OPERATOR_NAME, serviceState.getOperatorAlphaLong());
+    }
+
+    private void updateAreaInfo(String areaInfo) {
+        if (areaInfo != null) {
+            setSummaryText(KEY_LATEST_AREA_INFO, areaInfo);
+        }
+    }
+
+    void updateSignalStrength(SignalStrength signalStrength) {
+        if (mSignalStrength != null) {
+            final int state = mPhone.getServiceState().getState();
+            Resources r = getResources();
+
+            if ((ServiceState.STATE_OUT_OF_SERVICE == state) ||
+                    (ServiceState.STATE_POWER_OFF == state)) {
+                mSignalStrength.setSummary("0");
+            }
+
+            int signalDbm = signalStrength.getDbm();
+            int signalAsu = signalStrength.getAsuLevel();
+
+            if (-1 == signalDbm) {
+                signalDbm = 0;
+            }
+
+            if (-1 == signalAsu) {
+                signalAsu = 0;
+            }
+
+            mSignalStrength.setSummary(r.getString(R.string.sim_signal_strength,
+                        signalDbm, signalAsu));
+        }
+    }
+
+    private void updatePreference() {
+        if (mPhone.getPhoneType() != TelephonyManager.PHONE_TYPE_CDMA) {
+            // only show area info when SIM country is Brazil
+            if (COUNTRY_ABBREVIATION_BRAZIL.equals(mTelephonyManager.getSimCountryIso(
+                            mSir.getSubscriptionId()))) {
+                mShowLatestAreaInfo = true;
+            }
+        }
+
+        String rawNumber = mPhone.getLine1Number();  // may be null or empty
+        String formattedNumber = null;
+        if (!TextUtils.isEmpty(rawNumber)) {
+            formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
+        }
+        // If formattedNumber is null or empty, it'll display as "Unknown".
+        setSummaryText(KEY_PHONE_NUMBER, formattedNumber);
+        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*/));
+
+        if (!mShowLatestAreaInfo) {
+            removePreferenceFromScreen(KEY_LATEST_AREA_INFO);
+        }
+    }
+
+    private void updatePhoneInfos() {
+        final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(
+                        mSir.getSubscriptionId()));
+        if (UserHandle.myUserId() == UserHandle.USER_OWNER
+                && mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUB_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);
+                }
+            };
+        }
+    }
+    private OnTabChangeListener mTabListener = new OnTabChangeListener() {
+        @Override
+        public void onTabChanged(String tabId) {
+            final int slotId = Integer.parseInt(tabId);
+            mSir = mSelectableSubInfos.get(slotId);
+
+            // The User has changed tab; update the SIM information.
+            updatePhoneInfos();
+            mTelephonyManager.listen(mPhoneStateListener,
+                    PhoneStateListener.LISTEN_DATA_CONNECTION_STATE
+                    | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS
+                    | PhoneStateListener.LISTEN_SERVICE_STATE);
+            updateDataState();
+            updateNetworkType();
+            updatePreference();
+        }
+    };
+
+    private TabContentFactory mEmptyTabContent = new TabContentFactory() {
+        @Override
+        public View createTabContent(String tag) {
+            return new View(mTabHost.getContext());
+        }
+    };
+
+    private TabSpec buildTabSpec(String tag, String title) {
+        return mTabHost.newTabSpec(tag).setIndicator(title).setContent(
+                mEmptyTabContent);
+    }
+}
diff --git a/src/com/android/settings/notification/NotificationSettings.java b/src/com/android/settings/notification/NotificationSettings.java
index 6899440..bd08d8f 100644
--- a/src/com/android/settings/notification/NotificationSettings.java
+++ b/src/com/android/settings/notification/NotificationSettings.java
@@ -16,9 +16,15 @@
 
 package com.android.settings.notification;
 
+import android.app.NotificationManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteException;
@@ -42,7 +48,6 @@
 import android.provider.Settings;
 import android.util.Log;
 
-import android.widget.SeekBar;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -53,6 +58,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 public class NotificationSettings extends SettingsPreferenceFragment implements Indexable {
     private static final String TAG = "NotificationSettings";
@@ -75,6 +81,7 @@
     private final VolumePreferenceCallback mVolumeCallback = new VolumePreferenceCallback();
     private final H mHandler = new H();
     private final SettingsObserver mSettingsObserver = new SettingsObserver();
+    private final Receiver mReceiver = new Receiver();
 
     private Context mContext;
     private PackageManager mPM;
@@ -90,6 +97,8 @@
     private Preference mNotificationAccess;
     private boolean mSecure;
     private int mLockscreenSelectedValue;
+    private ComponentName mSuppressor;
+    private int mRingOrNotificationProgress;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -128,6 +137,7 @@
 
         mNotificationAccess = findPreference(KEY_NOTIFICATION_ACCESS);
         refreshNotificationListeners();
+        updateEffectsSuppressor();
     }
 
     @Override
@@ -136,6 +146,8 @@
         refreshNotificationListeners();
         lookupRingtoneNames();
         mSettingsObserver.register(true);
+        mReceiver.register(true);
+        updateEffectsSuppressor();
     }
 
     @Override
@@ -143,6 +155,7 @@
         super.onPause();
         mVolumeCallback.stopSample();
         mSettingsObserver.register(false);
+        mReceiver.register(false);
     }
 
     // === Volumes ===
@@ -154,12 +167,46 @@
         return volumePref;
     }
 
-    private void updateRingOrNotificationIcon(int progress) {
-        mRingOrNotificationPreference.showIcon(progress > 0
-                    ? R.drawable.ring_notif
-                    : (mVibrator == null
-                            ? R.drawable.ring_notif_mute
-                            : R.drawable.ring_notif_vibrate));
+    private void updateRingOrNotificationIcon() {
+        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));
+    }
+
+    private void updateEffectsSuppressor() {
+        final ComponentName suppressor = NotificationManager.from(mContext).getEffectsSuppressor();
+        if (Objects.equals(suppressor, mSuppressor)) return;
+        mSuppressor = suppressor;
+        if (mRingOrNotificationPreference != null) {
+            final String text = suppressor != null ?
+                    mContext.getString(com.android.internal.R.string.muted_by,
+                            getSuppressorCaption(suppressor)) : null;
+            mRingOrNotificationPreference.setSuppressionText(text);
+        }
+        updateRingOrNotificationIcon();
+    }
+
+    private String getSuppressorCaption(ComponentName suppressor) {
+        final PackageManager pm = mContext.getPackageManager();
+        try {
+            final ServiceInfo info = pm.getServiceInfo(suppressor, 0);
+            if (info != null) {
+                final CharSequence seq = info.loadLabel(pm);
+                if (seq != null) {
+                    final String str = seq.toString().trim();
+                    if (str.length() > 0) {
+                        return str;
+                    }
+                }
+            }
+        } catch (Throwable e) {
+            Log.w(TAG, "Error loading suppressor caption", e);
+        }
+        return suppressor.getPackageName();
     }
 
     private final class VolumePreferenceCallback implements VolumeSeekBarPreference.Callback {
@@ -464,6 +511,7 @@
         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 H() {
             super(Looper.getMainLooper());
@@ -482,12 +530,36 @@
                     mVolumeCallback.stopSample();
                     break;
                 case UPDATE_RINGER_ICON:
-                    updateRingOrNotificationIcon(msg.arg1);
+                    mRingOrNotificationProgress = msg.arg1;
+                    updateRingOrNotificationIcon();
+                    break;
+                case UPDATE_EFFECTS_SUPPRESSOR:
+                    updateEffectsSuppressor();
                     break;
             }
         }
     }
 
+    private class Receiver extends BroadcastReceiver {
+        private boolean mRegistered;
+
+        public void register(boolean register) {
+            if (mRegistered == register) return;
+            if (register) {
+                mContext.registerReceiver(this,
+                        new IntentFilter(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED));
+            } else {
+                mContext.unregisterReceiver(this);
+            }
+            mRegistered = register;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            mHandler.sendEmptyMessage(H.UPDATE_EFFECTS_SUPPRESSOR);
+        }
+    }
+
     // === Indexing ===
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index f391f86..0fdcc19 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -23,14 +23,18 @@
 import android.preference.PreferenceManager;
 import android.preference.SeekBarPreference;
 import android.preference.SeekBarVolumizer;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.SeekBar;
+import android.widget.TextView;
 
 import com.android.settings.R;
 
+import java.util.Objects;
+
 /** A slider preference that directly controls an audio stream volume (no dialog) **/
 public class VolumeSeekBarPreference extends SeekBarPreference
         implements PreferenceManager.OnActivityStopListener {
@@ -41,10 +45,13 @@
     private SeekBarVolumizer mVolumizer;
     private Callback mCallback;
     private ImageView mIconView;
+    private TextView mSuppressionTextView;
+    private String mSuppressionText;
 
     public VolumeSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr,
             int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
+        setLayoutResource(R.layout.preference_volume_slider);
     }
 
     public VolumeSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -108,13 +115,14 @@
         mVolumizer.start();
         mVolumizer.setSeekBar(mSeekBar);
         mIconView = (ImageView) view.findViewById(com.android.internal.R.id.icon);
+        mSuppressionTextView = (TextView) view.findViewById(R.id.suppression_text);
         mCallback.onStreamValueChanged(mStream, mSeekBar.getProgress());
+        updateSuppressionText();
     }
 
     // during initialization, this preference is the SeekBar listener
     @Override
-    public void onProgressChanged(SeekBar seekBar, int progress,
-            boolean fromTouch) {
+    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {
         super.onProgressChanged(seekBar, progress, fromTouch);
         mCallback.onStreamValueChanged(mStream, progress);
     }
@@ -133,6 +141,21 @@
                 + "/" + R.raw.media_volume);
     }
 
+    public void setSuppressionText(String text) {
+        if (Objects.equals(text, mSuppressionText)) return;
+        mSuppressionText = text;
+        updateSuppressionText();
+    }
+
+    private void updateSuppressionText() {
+        if (mSuppressionTextView != null && mSeekBar != null) {
+            mSuppressionTextView.setText(mSuppressionText);
+            final boolean showSuppression = !TextUtils.isEmpty(mSuppressionText);
+            mSuppressionTextView.setVisibility(showSuppression ? View.VISIBLE : View.INVISIBLE);
+            mSeekBar.setVisibility(showSuppression ? View.INVISIBLE : View.VISIBLE);
+        }
+    }
+
     public interface Callback {
         void onSampleStarting(SeekBarVolumizer sbv);
         void onStreamValueChanged(int stream, int progress);
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index f4b5887..6de0cc1 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -22,6 +22,7 @@
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.database.Cursor;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.Preference;
@@ -29,7 +30,7 @@
 import android.preference.PreferenceScreen;
 import android.provider.SearchIndexableResource;
 import android.provider.Telephony;
-import android.telephony.SubInfoRecord;
+import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.telephony.PhoneNumberUtils;
@@ -104,13 +105,13 @@
      * mSubInfoList is the list of all SubInfos.
      * mSelectableSubInfos is the list of SubInfos that a user can select for data, calls, and SMS.
      */
-    private List<SubInfoRecord> mAvailableSubInfos = null;
-    private List<SubInfoRecord> mSubInfoList = null;
-    private List<SubInfoRecord> mSelectableSubInfos = null;
+    private List<SubscriptionInfo> mAvailableSubInfos = null;
+    private List<SubscriptionInfo> mSubInfoList = null;
+    private List<SubscriptionInfo> mSelectableSubInfos = null;
 
-    private SubInfoRecord mCellularData = null;
-    private SubInfoRecord mCalls = null;
-    private SubInfoRecord mSMS = null;
+    private SubscriptionInfo mCellularData = null;
+    private SubscriptionInfo mCalls = null;
+    private SubscriptionInfo mSMS = null;
 
     private PreferenceCategory mSimCards = null;
 
@@ -125,7 +126,7 @@
         super.onCreate(bundle);
 
         if (mSubInfoList == null) {
-            mSubInfoList = SubscriptionManager.getActiveSubInfoList();
+            mSubInfoList = SubscriptionManager.getActiveSubscriptionInfoList();
         }
 
         createPreferences();
@@ -141,11 +142,11 @@
         mSimCards = (PreferenceCategory)findPreference(SIM_CARD_CATEGORY);
 
         final int numSlots = tm.getSimCount();
-        mAvailableSubInfos = new ArrayList<SubInfoRecord>(numSlots);
-        mSelectableSubInfos = new ArrayList<SubInfoRecord>();
+        mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
+        mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
         mNumSims = 0;
         for (int i = 0; i < numSlots; ++i) {
-            final SubInfoRecord sir = Utils.findRecordBySlotId(i);
+            final SubscriptionInfo sir = Utils.findRecordBySlotId(i);
             mSimCards.addPreference(new SimPreference(getActivity(), sir, i));
             mAvailableSubInfos.add(sir);
             if (sir != null) {
@@ -163,9 +164,9 @@
         final int numSlots = tm.getSimCount();
 
         mNumSims = 0;
-        mAvailableSubInfos = new ArrayList<SubInfoRecord>(numSlots);
+        mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
         for (int i = 0; i < numSlots; ++i) {
-            final SubInfoRecord sir = Utils.findRecordBySlotId(i);
+            final SubscriptionInfo sir = Utils.findRecordBySlotId(i);
             mAvailableSubInfos.add(sir);
             if (sir != null) {
                 mNumSims++;
@@ -179,7 +180,7 @@
     }
 
     private void updateSimSlotValues() {
-        SubscriptionManager.getAllSubInfoList();
+        SubscriptionManager.getAllSubscriptionInfoList();
 
         final int prefSize = mSimCards.getPreferenceCount();
         for (int i = 0; i < prefSize; ++i) {
@@ -198,7 +199,7 @@
 
     private void updateSmsValues() {
         final Preference simPref = findPreference(KEY_SMS);
-        final SubInfoRecord sir = Utils.findRecordBySubId(SubscriptionManager.getDefaultSmsSubId());
+        final SubscriptionInfo sir = Utils.findRecordBySubId(SubscriptionManager.getDefaultSmsSubId());
         simPref.setTitle(R.string.sms_messages_title);
         if (mSubInfoList.size() == 1) {
             simPref.setSummary(mSubInfoList.get(0).getDisplayName());
@@ -212,7 +213,7 @@
 
     private void updateCellularDataValues() {
         final Preference simPref = findPreference(KEY_CELLULAR_DATA);
-        final SubInfoRecord sir = Utils.findRecordBySubId(SubscriptionManager.getDefaultDataSubId());
+        final SubscriptionInfo sir = Utils.findRecordBySubId(SubscriptionManager.getDefaultDataSubId());
         simPref.setTitle(R.string.cellular_data_title);
         if (mSubInfoList.size() == 1) {
             simPref.setSummary(mSubInfoList.get(0).getDisplayName());
@@ -240,7 +241,7 @@
     public void onResume() {
         super.onResume();
 
-        mSubInfoList = SubscriptionManager.getActiveSubInfoList();
+        mSubInfoList = SubscriptionManager.getActiveSubscriptionInfoList();
         updateAvailableSubInfos();
         updateAllOptions();
     }
@@ -271,7 +272,7 @@
                     @Override
                     public void onClick(DialogInterface dialog, int value) {
 
-                        final SubInfoRecord sir;
+                        final SubscriptionInfo sir;
 
                         if (id == DATA_PICK) {
                             sir = mSelectableSubInfos.get(value);
@@ -305,7 +306,7 @@
             }
         } else {
             for (int i = 0; i < selectableSubInfoLength; ++i) {
-                final SubInfoRecord sir = mSelectableSubInfos.get(i);
+                final SubscriptionInfo sir = mSelectableSubInfos.get(i);
                 CharSequence displayName = sir.getDisplayName();
                 if (displayName == null) {
                     displayName = "";
@@ -322,7 +323,7 @@
         ListAdapter adapter = new SelectAccountListAdapter(
                 builder.getContext(),
                 R.layout.select_account_list_item,
-                arr);
+                arr, id);
 
         if (id == DATA_PICK) {
             builder.setTitle(R.string.select_sim_for_data);
@@ -339,47 +340,65 @@
     private class SelectAccountListAdapter extends ArrayAdapter<String> {
         private Context mContext;
         private int mResId;
+        private int mDialogId;
+        private final float OPACITY = 0.54f;
 
         public SelectAccountListAdapter(
-                Context context, int resource, String[] arr) {
+                Context context, int resource, String[] arr, int dialogId) {
             super(context, resource, arr);
             mContext = context;
             mResId = resource;
+            mDialogId = dialogId;
         }
 
         @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.textView = (TextView) rowView.findViewById(R.id.text);
-                holder.imageView = (ImageView) rowView.findViewById(R.id.icon);
+                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 {
+            } else {
                 rowView = convertView;
                 holder = (ViewHolder) rowView.getTag();
             }
 
-            holder.textView.setText(getItem(position));
-            holder.imageView.setImageDrawable(getResources().getDrawable(R.drawable.ic_sim_sd));
+            if (mDialogId == CALLS_PICK && position == 0) {
+                holder.title.setText(getItem(position));
+                holder.summary.setText("");
+                holder.icon.setImageDrawable(getResources()
+                        .getDrawable(R.drawable.ic_live_help));
+                holder.icon.setAlpha(OPACITY);
+            } else {
+                if (mDialogId == CALLS_PICK && position != 0) {
+                    sir = mSelectableSubInfos.get(position - 1);
+                } else {
+                    sir = mSelectableSubInfos.get(position);
+                }
+                holder.title.setText(sir.getDisplayName());
+                holder.summary.setText(sir.getNumber());
+                holder.icon.setImageBitmap(sir.createIconBitmap(mContext));
+            }
             return rowView;
         }
 
         private class ViewHolder {
-            TextView textView;
-            ImageView imageView;
+            TextView title;
+            TextView summary;
+            ImageView icon;
         }
     }
 
-    private void setActivity(Preference preference, SubInfoRecord sir) {
+    private void setActivity(Preference preference, SubscriptionInfo sir) {
         final String key = preference.getKey();
 
         if (key.equals(KEY_CELLULAR_DATA)) {
@@ -394,13 +413,15 @@
     }
 
     private class SimPreference extends Preference{
-        private SubInfoRecord mSubInfoRecord;
+        private SubscriptionInfo mSubInfoRecord;
         private int mSlotId;
         private int[] tintArr;
+        Context mContext;
 
-        public SimPreference(Context context, SubInfoRecord subInfoRecord, int slotId) {
+        public SimPreference(Context context, SubscriptionInfo subInfoRecord, int slotId) {
             super(context);
 
+            mContext = context;
             mSubInfoRecord = subInfoRecord;
             mSlotId = slotId;
             setKey("sim" + mSlotId);
@@ -411,12 +432,17 @@
         public void update() {
             final Resources res = getResources();
 
+            setTitle(String.format(getResources()
+                    .getString(R.string.sim_editor_title), (mSlotId + 1)));
             if (mSubInfoRecord != null) {
-                setTitle(String.format(res.getString(R.string.sim_editor_title),
-                        (mSubInfoRecord.getSimSlotIndex() + 1)));
-                setSummary(mSubInfoRecord.getDisplayName() + " - " +
-                        mSubInfoRecord.getNumber().toString());
-                setEnabled(true);
+                if (TextUtils.isEmpty(mSubInfoRecord.getNumber().toString())) {
+                   setSummary(mSubInfoRecord.getDisplayName());
+                } else {
+                    setSummary(mSubInfoRecord.getDisplayName() + " - " +
+                            mSubInfoRecord.getNumber().toString());
+                    setEnabled(true);
+                }
+                setIcon(new BitmapDrawable(res, (mSubInfoRecord.createIconBitmap(mContext))));
             } else {
                 setSummary(R.string.sim_slot_empty);
                 setFragment(null);
@@ -424,21 +450,7 @@
             }
         }
 
-        public String getFormattedPhoneNumber() {
-            try{
-                final String rawNumber = PhoneFactory.getPhone(mSlotId).getLine1Number();
-                String formattedNumber = null;
-                if (!TextUtils.isEmpty(rawNumber)) {
-                    formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
-                }
-
-                return formattedNumber;
-            } catch (java.lang.IllegalStateException ise){
-                return "Unknown";
-            }
-        }
-
-        public SubInfoRecord getSubInfoRecord() {
+        public SubscriptionInfo getSubInfoRecord() {
             return mSubInfoRecord;
         }
 
@@ -480,7 +492,12 @@
             });
 
             TextView numberView = (TextView)dialogLayout.findViewById(R.id.number);
-            numberView.setText(simPref.getFormattedPhoneNumber());
+            final String rawNumber = mSubInfoRecord.getNumber();
+            if (TextUtils.isEmpty(rawNumber)) {
+                numberView.setText(res.getString(com.android.internal.R.string.unknownName));
+            } else {
+                numberView.setText(PhoneNumberUtils.formatNumber(rawNumber));
+            }
 
             TextView carrierView = (TextView)dialogLayout.findViewById(R.id.carrier);
             carrierView.setText(mSubInfoRecord.getCarrierName());
@@ -528,13 +545,13 @@
      * @param context The Context
      * @return Sorted Subscription List or NULL if no activated Subscription
      */
-    public static List<SubInfoRecord> getSortedSubInfoList(Context context) {
-        List<SubInfoRecord> infoList = SubscriptionManager.getActiveSubInfoList();
+    public static List<SubscriptionInfo> getSortedSubInfoList(Context context) {
+        List<SubscriptionInfo> infoList = SubscriptionManager.getActiveSubscriptionInfoList();
         if (infoList != null) {
-            Collections.sort(infoList, new Comparator<SubInfoRecord>() {
+            Collections.sort(infoList, new Comparator<SubscriptionInfo>() {
 
                 @Override
-                public int compare(SubInfoRecord arg0, SubInfoRecord arg1) {
+                public int compare(SubscriptionInfo arg0, SubscriptionInfo arg1) {
                     int flag = arg0.getSimSlotIndex() - arg1.getSimSlotIndex();
                     if (flag == 0) {
                         return arg0.getSubscriptionId() - arg1.getSubscriptionId();
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
index 6b6175e..45c3a5b 100644
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java
@@ -616,9 +616,10 @@
         // Update to new summary
         StringBuilder summary = new StringBuilder();
 
-        if (isActive()) {
+        if (isActive()) { // This is the active connection
             summary.append(Summary.get(context, getState()));
-        } else if (mConfig != null && mConfig.noInternetAccess) {
+        } else if (mConfig != null
+                && mConfig.hasNoInternetAccess()) {
             summary.append(context.getString(R.string.wifi_no_internet));
         } else if (mConfig != null && ((mConfig.status == WifiConfiguration.Status.DISABLED &&
                 mConfig.disableReason != WifiConfiguration.DISABLED_UNKNOWN_REASON)
@@ -657,8 +658,8 @@
         }
 
         if (WifiSettings.mVerboseLogging > 0) {
-            //add RSSI/band information for this config, what was seen up to 6 seconds ago
-            //verbose WiFi Logging is only turned on thru developers settings
+            // Add RSSI/band information for this config, what was seen up to 6 seconds ago
+            // verbose WiFi Logging is only turned on thru developers settings
             if (mInfo != null && mNetworkInfo != null) { // This is the active connection
                 summary.append(" f=" + Integer.toString(mInfo.getFrequency()));
             }
@@ -687,6 +688,9 @@
             if (mConfig != null && mConfig.numAuthFailures > 0) {
                 summary.append(" authf=").append(mConfig.numAuthFailures);
             }
+            if (mConfig != null && mConfig.numNoInternetAccessReports > 0) {
+                summary.append(" noInt=").append(mConfig.numNoInternetAccessReports);
+            }
         }
 
         if (summary.length() > 0) {
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index 7d06fdb..ac93c2e 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -42,6 +42,7 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import com.android.settings.AppListSwitchPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -66,6 +67,7 @@
 
     private WifiManager mWifiManager;
     private NetworkScoreManager mNetworkScoreManager;
+    private AppListSwitchPreference mWifiAssistantPreference;
 
     private IntentFilter mFilter;
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -130,18 +132,14 @@
         pref.setIntent(intent);
 
         final Context context = getActivity();
-        SwitchPreference wifiAssistant = (SwitchPreference)findPreference(KEY_WIFI_ASSISTANT);
-        NetworkScorerAppData scorer = getWifiAssistantApp(context);
-        if (UserHandle.myUserId() == UserHandle.USER_OWNER && scorer != null) {
-            final boolean checked = NetworkScorerAppManager.getActiveScorer(context) != null;
-            wifiAssistant.setSummary(getResources().getString(
-                    R.string.wifi_automatically_manage_summary, scorer.mScorerName));
-            wifiAssistant.setOnPreferenceChangeListener(this);
-            wifiAssistant.setChecked(checked);
-        } else {
-            if (wifiAssistant != null) {
-                getPreferenceScreen().removePreference(wifiAssistant);
-            }
+        mWifiAssistantPreference = (AppListSwitchPreference) findPreference(KEY_WIFI_ASSISTANT);
+        Collection<NetworkScorerAppData> scorers =
+                NetworkScorerAppManager.getAllValidScorers(context);
+        if (UserHandle.myUserId() == UserHandle.USER_OWNER && !scorers.isEmpty()) {
+            mWifiAssistantPreference.setOnPreferenceChangeListener(this);
+            initWifiAssistantPreference(scorers);
+        } else if (mWifiAssistantPreference != null) {
+            getPreferenceScreen().removePreference(mWifiAssistantPreference);
         }
 
         Intent wifiDirectIntent = new Intent(context,
@@ -202,6 +200,18 @@
         }
     }
 
+    private void initWifiAssistantPreference(Collection<NetworkScorerAppData> scorers) {
+        int count = scorers.size();
+        String[] packageNames = new String[count];
+        int i = 0;
+        for (NetworkScorerAppData scorer : scorers) {
+            packageNames[i] = scorer.mPackageName;
+            i++;
+        }
+        mWifiAssistantPreference.setPackageNames(packageNames,
+                mNetworkScoreManager.getActiveScorerPackage());
+    }
+
     private void updateSleepPolicySummary(Preference sleepPolicyPref, String value) {
         if (value != null) {
             String[] values = getResources().getStringArray(R.array.wifi_sleep_policy_values);
@@ -261,12 +271,13 @@
                 return false;
             }
         } else if (KEY_WIFI_ASSISTANT.equals(key)) {
-            if (((Boolean)newValue).booleanValue() == false) {
+            NetworkScorerAppData wifiAssistant =
+                    NetworkScorerAppManager.getScorer(context, (String) newValue);
+            if (wifiAssistant == null) {
                 mNetworkScoreManager.setActiveScorer(null);
                 return true;
             }
 
-            NetworkScorerAppData wifiAssistant = getWifiAssistantApp(context);
             Intent intent = new Intent();
             if (wifiAssistant.mConfigurationActivityClassName != null) {
                 // App has a custom configuration activity; launch that.
@@ -282,6 +293,9 @@
             }
 
             startActivity(intent);
+            // Don't update the preference widget state until the child activity returns.
+            // It will be updated in onResume after the activity finishes.
+            return false;
         }
 
         if (KEY_SLEEP_POLICY.equals(key)) {
@@ -317,22 +331,6 @@
         wifiIpAddressPref.setSelectable(false);
     }
 
-    /**
-     * Returns the Network Scorer for the Wifi Assistant App.
-     */
-    public static NetworkScorerAppData getWifiAssistantApp(Context context) {
-        Collection<NetworkScorerAppData> scorers =
-                NetworkScorerAppManager.getAllValidScorers(context);
-
-        if (scorers.isEmpty()) {
-            return null;
-        }
-
-        // TODO: b/13780935 - Implement proper scorer selection. Rather than pick the first
-        // scorer on the system, we should allow the user to select one.
-        return scorers.iterator().next();
-    }
-
     /* Wrapper class for the WPS dialog to properly handle life cycle events like rotation. */
     public static class WpsFragment extends DialogFragment {
         private static int mWpsSetup;