diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 112b4b5..a11a948 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1379,7 +1379,7 @@
         </activity>
 
         <activity android:name="com.android.settings.accounts.AddAccountSettings"
-            android:theme="@android:style/Theme.Holo.Panel"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/header_add_an_account"
             android:taskAffinity="com.android.settings"
diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
deleted file mode 100644
index 81222cc..0000000
--- a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<!-- Layout containing two panes and a keyboard entry. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
->
-
-    <include layout="@layout/crypt_keeper_status" />
-
-    <!-- The right pane contains the encdroid image, a string, and an edit field. -->
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:layout_gravity="center_horizontal"
-    >
-        <ImageView android:id="@+id/encroid"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:src="@drawable/encroid_resignin"
-            android:contentDescription="@null"
-        />
-
-        <TextView android:id="@+id/passwordLabel"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_toEndOf="@+id/encroid"
-            android:layout_centerVertical="true"
-            android:paddingEnd="17dip"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/crypt_keeper_enter_password"
-        />
-
-        <!-- Password entry field -->
-        <LinearLayout
-            android:layout_height="wrap_content"
-            android:layout_width="320dip"
-            android:layout_toEndOf="@+id/passwordLabel"
-            android:layout_centerVertical="true"
-            android:orientation="horizontal"
-        >
-            <include layout="@layout/crypt_keeper_password_field" />
-        </LinearLayout>
-
-    </RelativeLayout>
-<!-- And this is the keyboard. -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="visible"
-    />
-
-</LinearLayout>
diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml
index 731fb22..f0a7cd0 100644
--- a/res/layout-sw600dp/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml
@@ -16,23 +16,25 @@
 ** limitations under the License.
 */
 -->
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
 >
+
     <include layout="@layout/crypt_keeper_status" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="0dip"
+        android:layout_weight="1"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="318dip"
     >
         <ImageView android:id="@+id/encroid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
+            android:layout_centerVertical="true"
             android:src="@drawable/encroid_resignin"
             android:contentDescription="@null"
         />
@@ -41,8 +43,7 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:layout_toEndOf="@+id/encroid"
-            android:layout_marginTop="37dip"
-            android:paddingStart="17dip"
+            android:layout_centerVertical="true"
             android:paddingEnd="17dip"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
@@ -54,12 +55,11 @@
             android:layout_height="wrap_content"
             android:layout_width="320dip"
             android:layout_toEndOf="@+id/passwordLabel"
-            android:layout_marginTop="26dip"
             android:layout_centerVertical="true"
             android:orientation="horizontal"
         >
             <include layout="@layout/crypt_keeper_password_field" />
         </LinearLayout>
-    </RelativeLayout>
 
+    </RelativeLayout>
 </LinearLayout>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b557303..266394a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -726,8 +726,7 @@
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"ስልኩ ሲተከል እና/ወይም ሲተኛ ምን እንደሚከሰት ለመቆጣጠር የእንቅልፍ ሁነታን ያብሩ።"</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"መቼ እንደሚተኛ"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"አሁን ተኛ"</string>
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"ቅንብሮች"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ራስ ሰርብሩህነት"</string>
     <string name="title_font_size" msgid="4405544325522105222">"የቁምፊ መጠን"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"የቅርጸ ቁምፊ መጠን"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 1b8219b..e0e181b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -606,8 +606,7 @@
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Запазването на мрежата не бе успешно"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Отказ"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Пропускане въпреки това"</string>
-    <!-- no translation found for wifi_dont_skip (7350341524881124808) -->
-    <skip />
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Без пропускане"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"Предупреждение: Това може да доведе до допълнителни таксувания за данни от оператора."\n\n"Настройката на таблета може да изисква значителна активност на мрежата."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"Предупреждение: Това може да доведе до допълнителни таксувания за данни от оператора."\n\n"Настройката на телефона може да изисква значителна активност на мрежата."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ПРЕДУПРЕЖДЕНИЕ: Таблетът няма да може да потвърди, че софтуерът ви е актуален."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 50141ba..76de85c 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -726,8 +726,7 @@
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Per controlar què passa quan el telèfon està connectat o en mode de repòs, activa el mode de repòs."</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Quan entri en mode de repòs"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Entra en mode de repòs"</string>
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Configuració"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Mida del tipus de lletra"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Mida de la lletra"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 168f72d..a36ae74 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -726,8 +726,7 @@
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Chcete-li nastavit, co se stane, když je telefon vložen do doku nebo je v režimu spánku, zapněte režim spánku."</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kdy spát"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Spát nyní"</string>
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavení"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Velikost písma"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 82bc7af..60d6a61 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -726,8 +726,7 @@
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Hvis du vil kontrollere, hvad der sker, når telefonen tilsluttes en dockingstation og/eller går i dvale, skal du slå Dvaletilstand til."</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Hvornår dvaletilstand skal slås til"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Gå i dvale nu"</string>
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Indstillinger"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Skriftstørrelse"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 400660d..f8071bc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -718,23 +718,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hintergrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Hintergrund auswählen"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Ruhezustand"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Bei angedocktem Gerät oder im Standby-Modus beim Aufladen"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Beides"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Während des Ladevorgangs"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Bei angedocktem Gerät"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Aus"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Um festzulegen, was geschieht, wenn das Telefon angedockt und/oder im Ruhezustand ist, aktivieren Sie den Energiesparmodus."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Start des Ruhezustands"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Ruhezustand ein"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Einstellungen"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Schriftgröße"</string>
@@ -1312,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Bildschirmvergrößerung"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Bei aktivierter Lupe können Sie:"\n\n" Zoomen: drei Mal tippen und halten"\n" Zoomen &amp; schwenken: drei Mal tippen und halten, dann den Finger ziehen"\n" Zwischen Heran- und Herauszoomen umschalten: drei Mal tippen und loslassen"\n\n" Wenn Sie herangezoomt haben, können Sie:"\n" Schwenken: mindestens 2 Finger über den Bildschirm ziehen"\n" Zoomstufe anpassen: mindestens 2 Finger zusammen- oder auseinanderziehen"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Bedienungshilfenverknüpfung"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Drücken und halten Sie die Ein-/Austaste, berühren Sie anschließend den Bildschirm und halten Sie zwei Finger darauf."</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Aus"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Wenn diese Funktion aktiviert ist, können Sie schnell in zwei Schritten Bedienungshilfen aktivieren:"\n\n"1. Schritt: Drücken und halten Sie die Ein-/Austaste, bis Sie einen Ton hören oder den Vibrationsalarm fühlen."\n"2. Schritt: Berühren Sie den Bildschirm und halten Sie zwei Finger darauf, bis Sie ein Audiosignal hören."\n\n"Wenn das Gerät von mehreren Nutzern verwendet wird, können Sie mit dieser Verknüpfung auf der Bildschirmsperre die Bedienungshilfen vorübergehend aktivieren, bis das Gerät entsperrt oder der Nutzer gewechselt wird."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Großer Text"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Bildschirmvergrößerung"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Vergrößerung autom. aktualisieren"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 67950fc..7147c47 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -726,8 +726,7 @@
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Για να ελέγξετε τι συμβαίνει όταν το τηλέφωνο είναι συνδεδεμένο και/ή σε κατάσταση αδράνειας, ενεργοποιήστε την κατάσταση αναστολής λειτουργίας."</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Ρύθμιση αναστολής λειτουργίας"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Ενεργοποίηση αναστολής λειτουργίας"</string>
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Ρυθμίσεις"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Μέγεθος γραμματοσειράς"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Μέγεθος γραμματοσειρ."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 744d7d1..e1c5025 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -726,8 +726,7 @@
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"To control what happens when the phone is docked and/or sleeping, turn Sleep Mode on."</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"When to sleep"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Sleep now"</string>
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Settings"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Font size"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 37f2ab4..91b38e2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -717,23 +717,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecciona una categoría"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Modo de suspensión"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Cuando el dispositivo esté en un conector o inactivo y cargando"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ambos casos"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando el dispositivo esté en un conector"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivado"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Para controlar lo que ocurre cuando el teléfono está conectado o inactivo, debes activar el modo de suspensión."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Cuándo activar el modo de suspensión"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Activar suspensión"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Ajustes"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño de fuente"</string>
@@ -1311,14 +1304,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Ampliación de pantalla"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"A continuación se indican las acciones que puedes hacer cuando la ampliación de la pantalla está activada."\n\n" Aplicar el zoom: toca la pantalla tres veces y manténla pulsada."\n" Aplicar el zoom e inclinar la imagen: toca la pantalla tres veces, manténla pulsada y, a continuación, arrastra el dedo."\n" Acercar o alejar la imagen: toca tres veces la pantalla y levanta el dedo."\n\n" A continuación se indican las acciones que puedes hacer con la imagen ampliada."\n" Inclinar la imagen: arrastra dos o más dedos por la pantalla."\n" Ajustar el nivel de zoom: pellizca la pantalla con dos o más dedos o sepáralos."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso directo a accesibilidad"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Mantén pulsado botón encendido y luego pantalla con 2 dedos."</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactivada"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Si activas esta esta función, podrás habilitar rápidamente las funciones de accesibilidad en dos pasos."\n\n"Paso 1: mantén pulsado el botón de encendido hasta que oigas un sonido o sientas una vibración."\n"Paso 2: mantén la pantalla pulsada con dos dedos hasta que oigas una confirmación de audio."\n\n"Si el dispositivo está configurado para varios usuarios, este acceso directo de la pantalla de bloqueo habilitará temporalmente la accesibilidad hasta que se desbloquee el dispositivo o hasta que se cambie de usuario."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Texto grande"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliación de pantalla"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizar ampliación automáticamente"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index bf62659..8e5f277 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -717,23 +717,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustapilt"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Taustapildi valimine:"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Unerežiim"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kui on dokitud või puhkerežiimis ja laeb"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Kui on dokitud või puhkerežiimis"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Laadimise ajal"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kui on dokitud"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Välja"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Kui soovite juhtida, mis juhtub telefoni dokkimisel ja/või puhkerežiimi lülitamisel, siis lülitage sisse unerežiim."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Unerežiimi ajal"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Nüüd unerežiimi"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Seaded"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaatne eredus"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fondi suurus"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Fondi suurus"</string>
@@ -1311,14 +1304,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Süsteem"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Ekraanisuurendus"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Kui ekraanisuurendus on sees, siis saate teha järgmist."\n\n" Suumida: puudutage kolm korda ja hoidke."\n" Suumida ja paanida: puudutage kolm korda ja hoidke, seejärel lohistage sõrmega."\n" Suumi sisse ja välja lülitada: puudutage kolm korda ja vabastage."\n\n" Sissesuumitud olekus saate teha järgmist."\n" Paanida: lohistage kahe või enama sõrmega üle ekraani."\n" Reguleerida suumitaset: vajutage kahte või enamat sõrme kokku või lahku."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Hõlbustuse otsetee"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Vajutage, hoidke toitenuppu, puud. ja hoidke kaht sõrme all"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Välja"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Kui see funktsioon on sisse lülitatud, saate hõlbustusfunktsioonid kahe toiminguga kiiresti lubada:"\n\n"1. toiming: vajutage ja hoidke toitenuppu all, kuni kuulete heli või tunnete värinat."\n"2. toiming: puudutage ja hoidke kaht sõrme all, kuni kuulete helikinnitust."\n\n"Kui seadmel on mitu kasutajat, aktiveerib selle otsetee kasutamine lukustusekraanil ajutiselt hõlbustusfunktsiooni, kuni seade on avanenud või kasutaja vahetunud."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Suur tekst"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekraanisuurendus"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekraanisuurenduse värskendus"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 903e6a9..fbc4ddd 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustakuva"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Valitse taustakuva"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Virransäästötila"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Telakoituna tai virransäästötilassa ja ladattaessa"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Joko"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Latauksen aikana"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Telakoituna"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Pois käytöstä"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Jos haluat hallita puhelimen toimintaa telakoituna ja/tai lepotilassa, ota virransäästötila käyttöön."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Virransäästötilaan siirtyminen"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Virransäästötilaan"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Järjestelmä"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Näytön suurennus"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Kun ruudun suurennus on käytössä, voit"\n\n" lähentää: napauta kolme kertaa äläkä vapauta viimeistä napautusta"\n" lähentää ja panoroida: napauta kolme kertaa, älä vapauta viimeistä napautusta ja vedä sormellasi"\n" ottaa lähennyksen tai loitonnuksen käyttöön: napauta kolme kertaa."\n\n" Lähennetyssä tilassa voit"\n" panoroida: vedä kahta tai useampaa sormea ruudulla"\n" säätää lähennyksen tasoa: nipistä tai laajenna vähintään kahdella sormella."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Esteettömyystilan pikakuvake"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Pidä virtapainike painettuna, kosketa pitkään 2 sormella"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Pois käytöstä"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Kun tämä ominaisuus on käytössä, voit ottaa esteettömyysominaisuudet käyttöön nopeasti kahden vaiheen kautta:"\n\n"Vaihe 1: pidä virtapainiketta painettuna, kunnes tunnet värinän tai kuulet äänimerkin."\n"Vaihe 2: kosketa kahdella sormella, kunnes kuulet äänivahvistuksen."\n\n"Jos laitteella on useita käyttäjiä, tämän pikakuvakkeen käyttäminen lukitusruudulla ottaa esteettömyystilan käyttöön väliaikaisesti, kunnes laitteen lukitus poistetaan tai käyttäjää vaihdetaan."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Suuri teksti"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Näytön suurennus"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Päivitä näytön suurennus automaatt."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7cabcd9..f7687f9 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fond d\'écran"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Sélectionner fond d\'écran dans"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Mode Veille"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Lorsque l\'appareil est installé sur la station d\'accueil ou lorsqu\'il est en veille et en charge"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Les deux"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Pendant la charge"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Sur la station d\'accueil"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Désactivé"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Pour contrôler le comportement du téléphone lorsqu\'il se trouve sur une station d\'accueil et/ou lorsqu\'il est en veille, activez le mode Veille."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"En veille"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Mettre en veille"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Système"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Loupe"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Lorsque la loupe est activée, vous pouvez effectuer les opérations suivantes :"\n\n" Faire un zoom : appuyez trois fois en prolongeant la troisième pression."\n" Faire un zoom et un panoramique : appuyez trois fois en prolongeant la troisième pression, puis faites glisser votre doigt sur l\'écran."\n" Basculer entre le zoom avant et le zoom arrière : appuyez trois fois de façon brève."\n\n" En mode zoom avant, vous pouvez effectuer les opérations suivantes :"\n" Faire un panoramique : faites glisser deux ou plusieurs doigts sur l\'écran."\n" Ajuster le niveau de zoom : pincez deux doigts ou plus."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Raccourci d\'accessibilité"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Pression prolongée sur Marche/Arrêt, puis avec deux doigts"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Désactivé"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Lorsque cette fonctionnalité est activée, vous pouvez activer rapidement les fonctionnalités d\'accessibilité en deux étapes."\n\n"Étape 1 : appuyez de manière prolongée sur le bouton Marche/Arrêt jusqu\'à ce que l\'appareil sonne ou vibre."\n"Étape 2 : appuyez de manière prolongée avec deux doigts jusqu\'à la confirmation audio."\n\n"Si l\'appareil comporte plusieurs utilisateurs et que vous utilisez ce raccourci alors que vous vous trouvez sur l\'écran de verrouillage, l\'accessibilité est activée de manière temporaire, jusqu\'à ce que vous déverrouilliez l\'appareil ou que vous changiez d\'utilisateur."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Grands caractères"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Loupe"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Mise à jour auto de la loupe"</string>
@@ -1583,8 +1573,8 @@
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Dés. données arr.-plan ?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"La désactivation des données en arrière-plan économise la batterie et réduit l\'utilisation des données. Certaines applications peuvent continuer d\'utiliser la connexion Internet en arrière-plan."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Synchro auto des données des applis"</string>
-    <string name="add_account_shared_system_warning" product="tablet" msgid="3385757125975372772">"Rappel : Comme sur n\'importe quel ordinateur partagé, d\'autres utilisateurs risquent de trouver un moyen d\'accéder à vos données sur cette tablette."</string>
-    <string name="add_account_shared_system_warning" product="default" msgid="2481548364278168869">"Rappel : Comme sur n\'importe quel ordinateur partagé, d\'autres utilisateurs risquent de trouver un moyen d\'accéder à vos données sur ce téléphone."</string>
+    <string name="add_account_shared_system_warning" product="tablet" msgid="3385757125975372772">"Rappel : Comme surtout appareil partagé, d\'autres utilisateurs risquent d\'accéder à vos données sur cette tablette."</string>
+    <string name="add_account_shared_system_warning" product="default" msgid="2481548364278168869">"Rappel : Comme sur tout appareil partagé, d\'autres utilisateurs risquent d\'accéder à vos données sur ce téléphone."</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Synchronisation activée"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Synchronisation désactivée"</string>
     <string name="sync_error" msgid="5060969083117872149">"Erreur de synchronisation"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d8bdaee..5f5c4b7 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"नि‍ष्‍क्रि‍यता के <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> के बाद"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"वॉलपेपर"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"यहां से वॉलपेपर चुनें:"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"निष्क्रिय मोड"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"डॉक किए हुए या निष्क्रिय रहने और चार्ज करने पर"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"कोई एक"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"चार्ज करते समय"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"जब डॉक किया हुआ हो"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"बंद"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"फ़ोन के डॉक किए होने पर और/या निष्क्रिय होने पर होने वाली कार्यवाही नियंत्रित करने के लिए निष्क्रिय मोड को चालू करें."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"कब निष्क्रिय करना है"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"अभी निष्क्रिय करें"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"स्‍वचालित चमक"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"सिस्‍टम"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"स्क्रीन आवर्धन"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"जब स्क्रीन आवर्धन चालू हो, तो आप "\n\n" ज़ूम कर सकते हैं: ट्रिपल-टैप करके रखें."\n" ज़ूम और पैन कर सकते हैं: ट्रिपल-टैप करके रखें, फिर अपनी अंगुली खींचें."\n" ज़ूम इन और आउट को टॉगल कर सकते हैं: ट्रिपल-टैप करके रखें."\n\n" जब आप ज़ूम इन हों, तब आप:"\n" पैन कर सकते हैं: स्क्रीन पर दो या अधिक अंगुलियों को खींचें."\n" ज़ूम स्तर एडजस्ट कर सकते हैं: दो या अधिक अंगुलियों के उपयोग से पास लाएं या विस्तृत करें."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"पहुंच-योग्यता शॉर्टकट"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"पावर को दबाकर रखें, फिर दो अंगुलियों से स्पर्श करके रखें"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"बंद"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"इस सुविधा के चालू रहते हुए, आप पहुंच-योग्यता सुविधाओं को दो चरणों में तेज़ी से सक्षम कर सकते हैं:"\n\n"चरण 1: पावर बटन को तब तक दबाकर रखें जब तक आपको कोई ध्वनि न सुनाई दे या कंपन महसूस न हो."\n"चरण 2: दो अंगुलियों से तब तक स्पर्श करके रखें जब तक कि आप ऑडियो पुष्टिकरण न सुन लें."\n\n"यदि उपकरण के एकाधिक उपयोगकर्ता हैं, तो लॉक स्क्रीन पर इस शॉर्टकट का उपयोग करने से पहुंच-योग्यता तब तक अस्थायी रूप से सक्षम हो जाती है जब तक कि उपकरण अनलॉक नहीं किया जाता या उपयोगकर्ता बदला नहीं जाता."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"बड़ा पाठ"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"स्क्रीन आवर्धन"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"स्क्रीन आवर्धन को स्वतः अपडेट करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c11bc71..0dc9913 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Pozadinska slika"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Odabir pozadinske slike iz"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Stanje mirovanja"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kada je uređaj na priključnoj stanici ili kada miruje i puni se"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ili"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Tijekom punjenja"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kada je na priključnoj stanici"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Isključeno"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Da biste kontrolirali događaje dok je telefon na priključnoj stanici i/ili dok miruje, uključite značajku Mirovanja."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kada mirovati"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Miruj sad"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sustav"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Uvećanje zaslona"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Kada je uvećanje zaslona uključeno, možete"\n\n" Zumirati: dodirnite triput i zadržite."\n" Zumirati i panirati: dodirnite triput i zadržite pa povucite prstom."\n" Izmjenjivati povećavanje i smanjivanje: dodirnite triput i otpustite."\n\n" Dok je prikaz povećan, možete:"\n" Panirati: povucite prstima po zaslonu."\n" Podesiti razinu zumiranja: spojite ili raširite prste."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Prečac pristupačnosti"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Prit. i držite tipku uklj. pa dodirnite i držite s dva prsta"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Isključeno"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Ako je ova značajka uključena, brzo možete omogućiti značajke pristupačnosti u dva koraka:"\n\n"1. korak: pritisnite i držite tipku za uključivanje/isključivanje do oglašavanja zvučnog signala ili vibracije."\n"2. korak: dodirnite s dva prsta i držite dok se ne oglasi zvučna potvrda."\n\n"Ako uređaj ima više korisnika, pomoću ovog prečaca na zaključanom zaslonu privremeno se omogućuje značajka pristupačnosti sve dok se ne otključa uređaj ili primijeni korisnik."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Veliki tekst"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Uvećanje zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Autom. ažuriranje uvećanja zaslona"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e15a45f..1e5ffd1 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -717,23 +717,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Háttérkép"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Válasszon tapétát innen:"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Alvó üzemmód"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Dokkolt vagy alvó állapotban, töltés közben"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Mindegy"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Töltés közben"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Dokkolt állapotban"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Ki"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Ha szeretné beállítani, hogy mi történjen a telefon dokkolt és/vagy alvó állapotában, kapcsolja be az Alvó üzemmódot."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Mikor lépjen alvó üzemmódba"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Alvó mód"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Beállítások"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Betűméret"</string>
@@ -1311,14 +1304,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Rendszer"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Képernyőnagyítás"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Amikor a képernyőnagyítás be van kapcsolva, a következőkre van lehetősége:"\n\n" Nagyítás/kicsinyítés: háromszori koppintás és lenyomva tartás."\n" Pásztázás és nagyítás/kicsinyítés:  háromszori koppintás és lenyomva tartás, majd az ujj húzása."\n" Váltás nagyítás és kicsinyítés között: háromszori koppintás és felengedés."\n\n" Nagyítás közben elérhető funkciók:"\n" Pásztázás: Két vagy több ujj áthúzása a képernyőn."\n" Nagyítás szintjének beállítása: két vagy több ujj összecsippentése vagy szétnyitása."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Hozzáférési gyorskombináció"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Tartsa lenyomva a bekapcsológombot; tartsa rajta két ujját."</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Ki"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Amikor ez a funkció be van kapcsolva, két lépésben gyorsan engedélyezheti a kisegítő funkciókat:"\n\n"1. lépés: Tartsa lenyomva a bekapcsológombot a hangjelzésig vagy rezgésig."\n"2. lépés: Tartsa lenyomva két ujját, amíg nem hallja a hangos jóváhagyást."\n\n"Ha az eszközt több felhasználó is használja, a fenti eljárás zárolt képernyőn való alkalmazásával ideiglenesen hozzáférhetővé válik az eszköz, egészen addig, amíg azt feloldják, vagy másik felhasználó kerül kiválasztásra."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Nagy szöveg"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Képernyőnagyítás"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Képernyőnagyítás automatikus frissítése"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 19cab7b..840ac6f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih wallpaper dari"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Mode Tidur"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Saat di dok atau tidur dan mengisi baterai"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Salah satu"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Saat mengisi daya"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Selagi di dok"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Mati"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Untuk mengontrol apa yang terjadi saat ponsel dipasang ke dok dan/atau sedang tidur, nyalakan Mode Mimpi."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Saat akan tidur"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Tidur Sekarang"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
@@ -1311,19 +1305,15 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Pembesaran layar"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Saat pembesaran aktif, Anda dapat"\n\n" Memperbesar: Ketuk tiga kali &amp; tahan."\n" Memperbesar &amp; menggeser: Ketuk tiga kali &amp; tahan, lalu seret jari Anda."\n" Beralih antara memperbesar dan memperkecil: Ketuk tiga kali &amp; lepaskan."\n\n" Saat memperbesar, Anda dapat:"\n" Menggeser: Seret dua atau beberapa jari ke seluruh layar."\n" Menyesuaikan tingkat pembesaran: Cubit atau luaskan menggunakan dua atau beberapa jari."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pintasan aksesibilitas"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Tekan dan tahan daya, lalu sentuh dan tahan dua jari"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Mati"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Ketika fitur ini diaktifkan, Anda dapat dengan cepat mengaktifkan fitur aksesibilitas dalam dua langkah:"\n\n"Langkah 1: Tekan dan tahan tombol daya sampai Anda mendengar suara atau merasakan getaran."\n"Langkah 2: Sentuh dan tahan dua jari sampai Anda mendengar konfirmasi audio."\n\n"Jika perangkat memiliki lebih dari satu pengguna, pintasan di layar kunci dapat digunakan sementara untuk mengaktifkan aksesibilitas sampai perangkat terbuka kuncinya atau pengguna diganti."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Teks besar"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pembesaran layar"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Perbarui otomatis pembesaran layar"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Perbarui pembesaran layar di transisi aplikasi"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tombol daya mengakhiri panggilan"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tombol daya - tutup telepon  panggilan"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Ucapkan sandi"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Penundaan sentuh &amp; tahan"</string>
     <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Tingkatkan aksesibilitas web"</string>
@@ -1433,7 +1423,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Setelan default di bawah menggantikan setelan apl"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Setelan default"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Mesin default"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Atur mesin sintesa suara untuk digunakan pada teks lisan"</string>
+    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Atur mesin sintesis suara untuk digunakan pada teks lisan"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Laju bicara"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kecepatan teks diucapkan"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tinggi nada"</string>
@@ -1441,15 +1431,15 @@
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Bahasa"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Menyetel suara spesifik bahasa untuk teks lisan"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Dengarkan contoh"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Putar demonstrasi singkat dari sintesa suara"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Putar demonstrasi singkat dari sintesis suara"</string>
     <string name="tts_install_data_title" msgid="4264378440508149986">"Pasang data suara"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Pasang data suara yang dibutuhkan untuk sintesa suara"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Suara yang diperlukan untuk sintesa suara sudah terpasang dengan baik"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Pasang data suara yang dibutuhkan untuk sintesis suara"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Suara yang diperlukan untuk sintesis suara sudah terpasang dengan baik"</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Setelan Anda telah berubah. Ini adalah contoh bunyinya."</string>
     <string name="tts_engine_error" msgid="3305141107104670703">"Mesin yang Anda pilih tidak dapat dijalankan."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurasikan"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pilih mesin lain"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Mesin sintesa suara ini mungkin dapat mengumpulkan semua teks yang akan diucapkan, termasuk di antaranya data pribadi seperti sandi dan nomor kartu kredit. Berasal dari <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> aplikasi. Gunakan metode masukan ini?"</string>
+    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Mesin sintesis suara ini mungkin dapat mengumpulkan semua teks yang akan diucapkan, termasuk di antaranya data pribadi seperti sandi dan nomor kartu kredit. Berasal dari <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> aplikasi. Gunakan metode masukan ini?"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mesin"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> setelan"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> diaktifkan"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4170207..bf37c7b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -726,8 +726,7 @@
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Per stabilire che cosa accade quando il telefono è inserito nel dock e/o in stand-by, attiva la Modalità di sospensione."</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Quando attivare la Modalità di sospensione"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Sospendi ora"</string>
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Impostazioni"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Dimensioni carattere"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 3c7ca72..d34cdb2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -726,8 +726,7 @@
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"כדי לשלוט במה שקורה כאשר הטלפון בעגינה ו/או במצב שינה, הפעל את מצב השינה."</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"מתי לעבור למצב שינה"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"עבור לשינה עכשיו"</string>
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"הגדרות"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
     <string name="title_font_size" msgid="4405544325522105222">"גודל גופן"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"גודל גופן"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2b7e0db..a733d7a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -608,10 +608,9 @@
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ネットワークを保存できませんでした"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"キャンセル"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"無視してスキップ"</string>
-    <!-- no translation found for wifi_dont_skip (7350341524881124808) -->
-    <skip />
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"スキップしない"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"警告: 追加のデータ通信料が発生する可能性があります。"\n\n"タブレットのセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
-    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告: 追加のデータ通信料が発生する可能性があります。"\n\n"携帯端末のセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告: 追加のデータ通信料が発生する可能性があります。"\n\n"タブレットのセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"警告: タブレットは、ソフトウェアが最新の状態かどうかを確認できません。"</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"警告: 携帯端末は、ソフトウェアが最新の状態かどうかを確認できません。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"タブレットからこのWi-Fiネットワークに接続できませんでした。"</string>
@@ -720,21 +719,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"操作が行われない状態で<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"壁紙"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"壁紙の選択先:"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"スリープモード"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"ホルダー装着時またはスリープ/充電時"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"いずれか"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充電時"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"ホルダー装着時"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"OFF"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"携帯端末のホルダー装着時やスリープ時の動作を管理するにはスリープモードをONにします。"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"スリープ開始のタイミング"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"スリープ開始"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
@@ -1314,14 +1307,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"システム"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"画面の拡大"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"画面の拡大がONになっている場合は、次のことを実行できます"\n\n" ズーム: ダブルタップして押し続ける。"\n" ズームしてパン: ダブルタップして押し続けた状態で指をドラッグする。"\n" 拡大/縮小の切り替え: トリプルタップして離す。"\n\n" 拡大表示時には次のことを実行できます:"\n" パン: 画面上で2本以上の指をドラッグする。"\n" ズームレベルを調整: 2本以上の指でピンチイン/アウトする。"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ユーザー補助のショートカット"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"電源ボタンを押し続け、次に2本の指でタップして押し続ける"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"OFF"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"この機能を有効にすると、次の2つのステップでユーザー補助機能をすぐに有効にできます:"\n\n"ステップ1: 音が鳴るか振動するまで電源ボタンを押し続けます。"\n"ステップ2: 確認音が鳴るまで2本の指でタップして押し続けます。"\n\n"複数のユーザーでこの端末を使用している場合は、ロック画面でこのショートカットを使用すると、端末がロック解除されるかユーザーが変更されるまでユーザー補助機能が一時的に有効になります。"</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"大きい文字サイズ"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"画面の拡大"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"画面の拡大を自動更新"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0938f47..509e21c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 동작이 없을 때"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"배경화면"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"배경화면 선택"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"절전 모드"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"도킹할 때 또는 대기상태이거나 충전할 때"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"도킹이나 대기상태일 때"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"충전하는 동안"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"도킹할 때"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"사용 안함"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"휴대전화가 도킹 또는 절전 모드일 때 작동 방식을 조정하려면 절전 모드를 사용하도록 설정하세요."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"절전 모드로 전환 시점"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"절전 모드로 전환"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"시스템"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"화면 확대"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"화면 확대를 사용하면 다음과 같은 기능을 사용할 수 있습니다."\n\n" 확대: 3번 길게 탭합니다."\n" 확대 및 이동: 3번 길게 탭한 뒤 손가락으로 드래그합니다."\n" 확대 및 축소 전환: 3번 길게 탭한 뒤 손가락을 뗍니다."\n\n" 화면이 확대된 상태에서는 다음과 같은 기능을 사용할 수 있습니다"\n" 이동: 2개 이상의 손가락으로 화면을 드래그합니다."\n" 확대 수준 조정: 2개 이상의 손가락을 사용하여 좁히거나 확장합니다."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"접근성 단축키"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"전원을 길게 누르고 두 손가락으로 길게 터치합니다."</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"사용 안함"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"이 기능을 사용하도록 설정하면 다음 두 단계를 거쳐 빠르게 접근성을 사용할 수 있습니다."\n\n"1단계: 소리가 들리거나 진동이 느껴질 때까지 전원 버튼을 길게 누릅니다."\n"2단계: 오디오 확인음이 들릴 때까지 두 손가락으로 길게 터치합니다."\n\n"여러 사용자가 이 기기를 사용할 경우, 화면 잠금 상태에서 이 단축키를 사용하면 기기가 잠금 해제되거나 사용자가 변경될 때까지 일시적으로 접근성을 사용 설정할 수 있습니다."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"큰 텍스트"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"화면 확대"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"화면 확대 자동 업데이트"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 81dc296..73f057a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -717,23 +717,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Darbalaukio fonas"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pasirinkti darbalaukio foną iš"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Miego režimas"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kai yra doke arba kai veikia miego režimas ir kraunamas akumuliatorius"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bet kuris variantas"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Įkraunant"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kai yra doke"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Išjungta"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Jei norite valdyti, kas vyksta, kai telefonas yra prijungtas prie doko ir (arba) veikia miego režimu, įjunkite miego režimą."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kada įjungti miego režimą"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Įjungti miego režimą dabar"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Nustatymai"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis ryškumas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Šrifto dydis"</string>
@@ -1311,14 +1304,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Ekrano didinimas"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Kai ekrano didinimo funkcija įjungta, galite"\n\n" Keisti mastelį: tris kartus palieskite ir laikykite."\n" Keisti mastelį ir iš lėto apžvelgti: tris kartus palieskite ir laikykite, tada vilkite pirštu."\n" Kaitalioti priartinimą ir atitolinimą: tris kartus palieskite ir atleiskite."\n\n" Priartinę galite:"\n" Iš lėto apžvelgti: vilkite mažiausiai dviem pirštais ekrane."\n" Koreguoti mastelio keitimo lygį: suimkite arba išplėskite mažiausiai dviem pirštais."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Spart. pritaikymo neįgal. įjungimas"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Laik. pasp. mait. mygt., tada palies. dviem piršt. ir laik."</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Išjungta"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Jei ši funkcija yra įjungta, galite greitai įgalinti pritaikymo neįgaliesiems funkcijas atlikę du veiksmus:"\n\n"1 veiksmas: paspauskite maitinimo mygtuką ir laikykite jį paspaudę, kol išgirsite garsą arba pajusite vibravimą."\n"2 veiksmas: palieskite ekraną dviem pirštais ir laikykite palietę, kol išgirsite garsinį patvirtinimą."\n\n"Jei įrenginiu naudojasi keli naudotojai, atlikę šiuos veiksmus užrakintame ekrane laikinai įgalinsite pritaikymo neįgaliesiems režimą. Jis bus išjungtas atrakinus įrenginį arba kai pasikeis naudotojas."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Didelis tekstas"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekrano didinimas"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automat. atnaujinti ekrano didinimą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index e690bf4..dc53d9f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -717,23 +717,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fona tapete"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Fona tapetes izvēle no"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Miega režīms"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kad tālrunis tiek dokots vai ir miega režīmā un notiek uzlāde"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Vienā no gadījumiem"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Uzlādes laikā"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kamēr tiek dokots"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Izslēgts"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Lai kontrolētu, kas notiek ar tālruni, kad tas tiek dokots un/vai atrodas miega režīmā, ieslēdziet miega režīmu."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kad ieslēgt miega režīmu"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Ieslēgt miega režīmu"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Iestatījumi"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Fonta lielums"</string>
@@ -1311,14 +1304,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistēma"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Ekrāna palielinājums"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Ja ir ieslēgts ekrāna palielinājums, varat veikt tālāk norādītās darbības."\n\n"Veikt tālummaiņu: trīsreiz pieskarieties un turiet."\n"Veikt tālummaiņu un bīdīt: trīsreiz pieskarieties un turiet, pēc tam velciet ar pirkstu."\n"Pārslēgt tuvināšanu vai tālināšanu: trīsreiz pieskarieties un atlaidiet."\n\n"Tuvinot varat veikt tālāk norādītās darbības."\n"Bīdīt: velciet ar diviem vai vairāk pirkstiem pa ekrānu."\n"Pielāgot tālummaiņas līmeni: savelciet vai izvērsiet, izmantojot vienu vai vairāk pirkstus."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pieejamības saīsne"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Nosp. un turiet bar. p.; piesk. un turiet divus pirkstus."</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Izslēgta"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Ja šī funkcija ir ieslēgta, varat ātri iespējot pieejamības funkcijas, veicot divas darbības."\n\n"1. darbība. Nospiediet un turiet barošanas pogu, līdz dzirdat skaņu vai jūtat vibrāciju."\n"2. darbība. Pieskarieties un turiet divus pirkstus, līdz dzirdat skaņas apstiprinājumu."\n\n"Ja ierīci izmanto vairāki lietotāji, šī bloķēšanas ekrāna saīsne nodrošina īslaicīgu pieejamību, līdz ierīce tiek atbloķēta vai tiek mainīts lietotājs."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Liels teksts"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekrāna palielinājums"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekrāna palielinājuma autom. atjaun."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index b9ba508..2f3a3bd 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -606,8 +606,7 @@
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Gagal menyimpan rangkaian"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Batal"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Langkau juga"</string>
-    <!-- no translation found for wifi_dont_skip (7350341524881124808) -->
-    <skip />
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Jangan langkau"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AMARAN: Anda mungkin dikenakan caj data pembawa tambahan."\n\n"Persediaan tablet boleh menggunakan aktiviti rangkaian yang besar."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AMARAN: Anda mungkin dikenakan caj data pembawa tambahan."\n\n"Persediaan telefon boleh memerlukan aktiviti rangkaian yang banyak."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AMARAN: Tablet tidak akan dapat mengesahkan bahawa perisian anda adalah terkini."</string>
@@ -718,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Kertas dinding"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih kertas dinding dari"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Mod Tidur"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Apabila didok atau tidur dan dicas"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Salah satu"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Semasa mengecas"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Semasa didok"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Matikan"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Untuk mengawal apa yang berlaku semasa telefon didok dan/atau tidur, hidupkan Mod Tidur."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Bila untuk tidur"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Tidur sekarang"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
@@ -1312,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Pembesaran skrin"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Apabila pembesaran skrin dihidupkan, anda boleh"\n\n" Zum: Ketik tiga kali &amp; tahan."\n" Zum &amp; sorotkan: Ketik tiga kali &amp; tekan, kemudian seret jari anda."\n" Togol zum masuk atau keluar: Ketik tiga kali &amp; lepaskan."\n\n" Semasa anda dizum masuk, anda boleh:"\n" Pendar: Seret dua atau lebih jari di skrin."\n" Laraskan tahap zum: Cubit atau kembangkan menggunakan dua atau lebih jari."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pintasan kebolehcapaian"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Tekan dan tahan kuasa, kemudian sentuh dan tahan dgn dua jari"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Matikan"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Apabila ciri ini dihidupkan, anda boleh mendayakan ciri kebolehcapaian dengan cepat dalam dua langkah:"\n\n"Langkah 1: Tekan dan tahan butang kuasa sehingga anda mendengar bunyi atau merasa getaran."\n"Langkah 2: Sentuh dan tahan dengan dua jari sehingga anda mendengar pengesahan audio."\n\n"Jika peranti ini mempunyai berbilang pengguna, menggunakan pintasan ini pada skrin kunci akan mendayakan kebolehcapaian secara sementara sehingga peranti dibuka kunci atau pengguna ditukar."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Teks besar"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pembesaran skrin"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto kemas kini pembesaran skrin"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6c0c0e7..5040ce6 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -606,8 +606,7 @@
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Kunne ikke lagre nettverket"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Hopp over uansett"</string>
-    <!-- no translation found for wifi_dont_skip (7350341524881124808) -->
-    <skip />
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Ikke hopp over"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ADVARSEL: Du kan pådra deg ekstra datakostnader fra operatøren."\n\n"Nettbrettkonfigureringen kan kreve betydelig nettverksaktivitet."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVARSEL: Du kan pådra deg ekstra datakostnader fra operatøren."\n\n"Telefonkonfigureringen kan kreve betydelig nettverksaktivitet."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ADVARSEL: Nettbrettet kommer ikke til å kunne bekrefte at programvaren din er oppdatert."</string>
@@ -727,8 +726,7 @@
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Hvis du vil kontrollere hva som skjer når telefonen er plassert i dokken og/eller i hvilemodus, slår du på hvilemodus."</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Når skal hvilemodus aktiveres?"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Aktiver hvilemodus"</string>
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Innstillinger"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Skriftstørrelse"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c301c1e..434cf4e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -607,8 +607,8 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuleren"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Toch overslaan"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Niet overslaan"</string>
-    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"WAARSCHUWING: er worden mogelijk extra gegevenskosten door de provider in rekening gebracht."\n\n"Het instellen van de tablet kan aanzienlijke netwerkactiviteit vereisen."</string>
-    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"WAARSCHUWING: er worden mogelijk extra gegevenskosten door de provider in rekening gebracht."\n\n"Het instellen van de telefoon kan aanzienlijke netwerkactiviteit vereisen."</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"WAARSCHUWING: er worden mogelijk extra kosten voor dataverkeer in rekening gebracht."\n\n"Het instellen van de tablet kan aanzienlijke netwerkactiviteit vereisen."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"WAARSCHUWING: er worden mogelijk extra kosten voor dataverkeer in rekening gebracht."\n\n"Het instellen van de telefoon kan aanzienlijke netwerkactiviteit vereisen."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"WAARSCHUWING: de tablet kan niet controleren of uw software is bijgewerkt."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"WAARSCHUWING: de telefoon kan niet verifiëren of uw software is bijgewerkt."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"De tablet kan geen verbinding maken met dit wifi-netwerk."</string>
@@ -726,8 +726,7 @@
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Schakel Slaapmodus in om te bepalen wat er gebeurt wanneer de telefoon is gedockt en/of de slaapmodus actief is."</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Wanneer slapen"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Nu slapen"</string>
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Instellingen"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e0dd7a5..056247e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -717,23 +717,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Wybierz tapetę z..."</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Tryb uśpienia"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Podczas zadokowania lub uśpienia i ładowania"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Albo"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Podczas ładowania"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Podczas zadokowania"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Wył."</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Aby określić działanie po zadokowaniu i/lub uśpieniu telefonu, włącz tryb uśpienia."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kiedy zasnąć"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Zaśnij teraz"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Ustawienia"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Rozmiar czcionki"</string>
@@ -1122,7 +1115,7 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> i <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
-    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Działanie tej aplikacji może spowodować naliczenie opłat:"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"W aplikacji mogą być pobierane opłaty:"</string>
     <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Wyślij droższego SMS-a"</string>
     <string name="computing_size" msgid="1599186977475211186">"Przetwarzanie..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Nie udało się obliczyć rozmiaru pakietu."</string>
@@ -1312,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Powiększenie ekranu"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Przy włączonym powiększeniu ekranu możesz:"\n\n" Powiększać: kliknij trzykrotnie i przytrzymaj."\n" Powiększać i przesuwać: kliknij trzykrotnie i przytrzymaj, a następnie przesuń palcem."\n" Przełączać między powiększeniem i pomniejszeniem: kliknij trzykrotnie, a następnie puść."\n\n" Gdy powiększenie jest aktywne, możesz:"\n" Przesuwać: przeciągnij co najmniej dwoma placami po ekranie."\n" Dostosować stopień powiększenia: ściągnij do siebie co najmniej dwa palce lub oddal je od siebie."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skrót ułatwień dostępu"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Naciśnij i przytrzymaj zasilanie, potem dotknij i przytrzymaj dwoma palcami"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Wył."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Gdy ta funkcja jest włączona, możesz szybko włączać funkcje ułatwień dostępu w dwóch krokach:"\n\n"Krok 1: naciśnij przycisk zasilania i przytrzymaj go, aż usłyszysz dźwięk lub poczujesz wibrację."\n"Krok 2: dotknij ekranu dwoma palcami i przytrzymaj je, aż usłyszysz potwierdzenie dźwiękowe."\n\n"Jeśli z urządzenia korzysta wielu użytkowników, użycie tego skrótu na ekranie blokady tymczasowo włącza ułatwienia dostępu do momentu odblokowania urządzenia lub zmiany użytkownika."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Duży tekst"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Powiększenie ekranu"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatyczna aktualizacja powiększenia ekranu"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7a5cf75..5722580 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -726,8 +726,7 @@
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Para controlar o que acontece quando o telemóvel está ancorado e/ou em suspensão, ative o Modo de Suspensão."</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Quando deve entrar em suspensão"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Colocar em suspensão agora"</string>
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Definições"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a98c6e4..8669ee9 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -606,8 +606,7 @@
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Falha ao salvar a rede"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Ignorar mesmo assim"</string>
-    <!-- no translation found for wifi_dont_skip (7350341524881124808) -->
-    <skip />
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Não ignorar"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AVISO: você poderá receber cobranças significativas de dados da operadora."\n\n"A configuração do tablet pode exigir atividade de rede significativa."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVISO: você poderá receber cobranças significativas de dados da operadora."\n\n"A configuração do telefone pode exigir atividade de rede significativa."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AVISO: o tablet não será capaz de verificar a atualização do software."</string>
@@ -718,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Plano de fundo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecionar plano de fundo de"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Modo de suspensão"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quando encaixado ou suspenso e carregando"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ou"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Ao carregar"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando encaixado"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desativado"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Para controlar o que acontece quando o telefone está encaixado e/ou suspenso, ative o modo de suspensão."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Quando suspender"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Suspender"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
@@ -1312,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Ampliação da tela"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Quando a ampliação de tela está ativada, você pode:"\n\n" Aumentar o zoom: toque três vezes e segure."\n" Aumentar o zoom e deslocar: toque três vezes, segure e arraste o dedo."\n" Aumentar ou diminuir o zoom: toque três vezes e solte."\n\n" Quando o zoom é aplicado, você pode:"\n" Deslocar: arraste dois ou mais dedos pela tela."\n" Ajustar o nível de zoom: use o gesto de pinçagem ou expanda usando dois ou mais dedos."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Segure o botão liga/desliga, toque e segure com dois dedos"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desativado"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Quando este recurso está ligado, você pode ativar rapidamente os recursos de acessibilidade em duas etapas:"\n\n"Etapa 1: mantenha pressionado o botão liga/desliga até ouvir um som ou sentir uma vibração."\n"Etapa 2: toque com dois dedos e mantenha pressionado até ouvir a confirmação de áudio."\n\n"Caso o dispositivo tenha vários usuários, o uso deste atalho na tela de bloqueio ativará temporariamente a acessibilidade até que o dispositivo seja desbloqueado ou o usuário seja alterado."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Texto grande"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliação da tela"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atual. autom. da ampliação da tela"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c5befbd..2b0ecba 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -606,12 +606,11 @@
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nu s-a putut salva reţeaua"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Anulaţi"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Ignoraţi oricum"</string>
-    <!-- no translation found for wifi_dont_skip (7350341524881124808) -->
-    <skip />
-    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AVERTISMENT: puteţi acumula taxe suplimentare pentru date de la operator."\n\n"Configurarea tabletei poate presupune o activitate semnificativă în reţea."</string>
-    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVERTISMENT: puteţi acumula taxe suplimentare pentru date de la operator."\n\n"Configurarea telefonului poate presupune o activitate semnificativă în reţea."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AVERTISMENT: tableta nu va putea să verifice dacă software-ul dvs. este actualizat."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AVERTISMENT: telefonul nu va putea să verifice dacă software-ul dvs. este actualizat."</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Nu ignoraţi"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AVERTISMENT: puteţi acumula costuri suplimentare pentru date de la operator."\n\n"Configurarea tabletei poate presupune o activitate semnificativă în reţea."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVERTISMENT: puteţi acumula costuri suplimentare pentru date de la operator."\n\n"Configurarea telefonului poate presupune o activitate semnificativă în reţea."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AVERTISMENT: tableta nu va putea să verifice dacă software-ul este actualizat."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AVERTISMENT: telefonul nu va putea să verifice dacă software-ul este actualizat."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tableta nu s-a putut conecta la această reţea Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefonul nu s-a putut conecta la această reţea Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Setări Wi-Fi avansate"</string>
@@ -718,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagine de fundal"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Aleg. o imag. de fundal de la"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Modul inactiv"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Când dispozitivul este andocat sau în modul inactiv şi se realizează încărcarea"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Oricare"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"În timpul încărcării"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Când dispozitivul este andocat"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Dezactivat"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Pentru a controla ceea ce se întâmplă când telefonul este andocat şi/sau în modul inactiv, activaţi modul inactiv."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Când se activează modul inactiv"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Activaţi modul inactiv acum"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
@@ -1313,14 +1306,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Mărirea ecranului"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Când este activată mărirea ecranului, puteţi:"\n\n" să panoramaţi: atingeţi de trei ori şi menţineţi apăsat;"\n" să panoramaţi şi să deplasaţi: atingeţi de trei ori şi menţineţi apăsat, apoi deplasaţi degetul pe ecran;"\n" să comutaţi între mărire şi micşorare: atingeţi de trei ori şi eliberaţi."\n\n" În timp ce măriţi, puteţi:"\n" să deplasaţi: deplasaţi două sau mai multe degete pe ecran;"\n" să ajustaţi nivelul de zoom: ciupiţi sau extindeţi cu două sau mai multe degete."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Comandă rapidă accesibilitate"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Apăsaţi lung butonul de pornire. Atingeţi lung cu 2 degete."</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Dezactivată"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"După activarea acestei funcţii, puteţi să activaţi rapid funcţiile de accesibilitate în doi paşi:"\n\n"Pasul 1: apăsaţi şi menţineţi apăsat butonul de pornire până când auziţi un sunet sau simţiţi o vibraţie."\n"Pasul 2: atingeţi ecranul cu două degete şi menţineţi degetele pe ecran până când auziţi o confirmare audio."\n\n"Dacă dispozitivul are mai mulţi utilizatori, folosirea acestei comenzi rapide pe ecranul de blocare activează temporar accesibilitatea până când gadgetul este deblocat sau se schimbă utilizatorul."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Text mare"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Mărirea ecranului"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizaţi auto. mărirea ecranului"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 70570f6..580aa8b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -606,10 +606,9 @@
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Не удалось сохранить сеть."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Отмена"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Все равно пропустить"</string>
-    <!-- no translation found for wifi_dont_skip (7350341524881124808) -->
-    <skip />
-    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ВНИМАНИЕ! Возможны дополнительные расходы на услуги оператора связи."\n\n"Настройка планшетного ПК может потребовать передачи большого объёма данных по сети."</string>
-    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ВНИМАНИЕ! Возможны дополнительные расходы на услуги оператора связи."\n\n"Настройка телефона может потребовать передачи большого объёма данных по сети."</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Не пропускать"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ВНИМАНИЕ! Возможны дополнительные расходы на услуги оператора связи."\n\n"Настройка устройства может потребовать передачи большого объема данных по сети."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ВНИМАНИЕ! Возможны дополнительные расходы на услуги оператора связи."\n\n"Настройка устройства может потребовать передачи большого объема данных по сети."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ВНИМАНИЕ! Поиск обновлений для программного обеспечения не поддерживается."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ВНИМАНИЕ! Поиск обновлений для программного обеспечения не поддерживается."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Не удалось подключиться к сети Wi-Fi."</string>
@@ -718,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездействия"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Обои"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Установка обоев"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Спящий режим"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"При подключении к док-станции, при переходе в спящий режим и во время зарядки"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Либо"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Во время зарядки"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"При подключении к док-станции"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ВЫКЛ"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Чтобы знать, что происходит с телефоном, когда он подключен к док-станции или находится в спящем режиме, включите заставку."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Когда включать спящий режим"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Спящий режим"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Автонастройка"</string>
@@ -1312,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Увеличение"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Если включена эта функция, вы можете:"\n\n" Увеличить изображение. Для этого нажмите на него три раза и удерживайте палец на экране."\n" Увеличить изображение и создать панораму. Для этого нажмите на него три раза и удерживайте палец, а затем проведите им по экрану."\n" Переключаться между увеличением и уменьшением изображения. Для этого нажмите на него три раза и отпустите."\n\n" В режиме масштабирования доступны следующие действия."\n" Перемещение: проведите по экрану несколькими пальцами."\n" Изменение масштаба: сведите или разведите пальцы."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Быстрое включение"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Нажмите и удерживайте кнопку питания, а затем нажмите на экран двумя пальцами и удерживайте их"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"ВЫКЛ"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Вы сможете быстро включать специальные возможности. Вот как это сделать."\n\n"1. Нажмите кнопку питания и удерживайте ее, пока не раздастся звуковой сигнал или вибросигнал."\n"2. Нажмите на экран двумя пальцами и не отпускайте их, пока не услышите сообщение о том, что команда выполнена."\n\n"Если устройством пользуется несколько человек, специальные возможности будут включены до тех пор, пока устройство не будет разблокировано или не будет выбран другой пользователь."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Крупный текст"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Масштаб"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Сохранять масштаб"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3ba9fd5..05b9dbf 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrať tapetu z"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Režim spánku"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Pri vložení do doku alebo pri nabíjaní v režime spánku"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Oboje"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Pri nabíjaní"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Počas prítomnosti zariadenia v doku"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Vypnuté"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Ak chcete nastaviť, čo sa stane, keď sa telefón vloží do doku alebo je v režime spánku, zapnite Režim spánku."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kedy spať"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Spať"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Priblíženie obrazovky"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Ak je zväčšenie obrazovky zapnuté, môžete:"\n\n" Priblížiť: trikrát poklepte a podržte."\n" Priblížiť a posunúť: trikrát poklepte, podržte a potiahnite prstom."\n" Prepnúť priblíženie alebo oddialenie: trikrát poklepte a uvoľnite."\n\n" Počas priblíženia môžete:"\n" Posúvať: potiahnite dvoma alebo viacerými prstami po obrazovke."\n" Upraviť úroveň priblíženia: priblížte alebo oddiaľte dva alebo viacero prstov."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skratka zjednodušeného ovládania"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Stlač. a podrž. tlač. zapnutia, potom sa dotk. dvoma prst. a podržte"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Vypnuté"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Keď je táto funkcia zapnutá, môžete povoliť funkcie zjednodušenia ovládania dvoma krokmi:"\n\n"Krok 1: stlačte a podržte tlačidlo zapnutia, kým nezaznie zvukový signál alebo dokým nezacítite vibrácie."\n"Krok 2: dotknite sa dvoma prstami a podržte ich, kým nezaznie zvukové potvrdenie."\n\n"Ak zariadenie používa viac používateľov, pomocou tejto skratky na obrazovke uzamknutia je možné dočasne povoliť zjednodušenie ovládania, dokým sa zariadenie neodomkne alebo dokým sa nezmení používateľ."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Veľké písmo"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Priblíženie obrazovky"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto. aktualiz. priblíž. obrazovky"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 366b561..a40bead 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Ozadje"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Izberite ozadje iz"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Stanje pripravljenosti"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"V stojalu ali v stanju pripravljenosti in med polnjenjem"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Eno ali drugo"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Med napajanjem"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"V stojalu"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Izklopljeno"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Če želite nadzorovati, kaj se dogaja, ko je telefon v stojalu in/ali v stanju pripravljenosti, vklopite »Stanje pripravljenosti«."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Čas preklopa v stanje pripravljenosti"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Stanje pripravljenosti"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Povečava zaslona"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Ko je povečava zaslona vklopljena, lahko:"\n\n" Povečate/pomanjšate: trikrat se dotaknite in pridržite."\n" Povečate/pomanjšate in prečno premaknete: trikrat se dotaknite in pridržite, nato povlecite s prstom."\n" Preklopite med povečavo in pomanjšavo: trikrat se dotaknite in izpustite."\n\n" Med povečavo:"\n" Se lahko prečno premaknete: z vsaj dvema prstoma povlecite po zaslonu."\n" Prilagodite raven povečave/pomanjšave: vsaj dva prsta povlecite skupaj ali ju razmaknite."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Bližnj. prip. za ljudi s pos. pot."</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Pridržite gumb za napajanje, nato še dva prsta na zaslonu"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Izklopljeno"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Ko je ta funkcija vklopljena, lahko s preprostim postopkom v dveh korakih omogočite pripomočke za ljudi s posebnimi potrebami:"\n\n"1. korak: Pridržite gumb za napajanje, dokler ne zaslišite piska ali začutite vibriranja."\n"2. korak: Na zaslonu pridržite dva prsta, dokler ne slišite zvočne potrditve."\n\n"Če ima naprava več uporabnikov, lahko s to bližnjico na zaklenjenem zaslonu začasno omogočite pripomočke za ljudi s posebnimi potrebami, dokler ni naprava odklenjena ali jo uporablja kdo drug."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Veliko besedilo"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Povečava zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Samodejno posodobi povečavo zaslona"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 7ea3910..7cbf1f4 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивности"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Позадина"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Избор позадине из"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Режим спавања"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Када је на базној станици или у стању спавања и пуни се"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Било које"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Током пуњења"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Док је на базној станици"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Искључено"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Да бисте контролисали шта се дешава када је телефон на базној станици и/или у стању спавања, укључите Режим спавања."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Када треба активирати спавање"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Спавај одмах"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Аутоматски ниво осветљености"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Систем"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Увеличавање екрана"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Када је увеличавање екрана укључено, можете"\n\n" Да зумирате: трипут додирните и задржите."\n" Да зумирате и померате приказ: трипут додирните и задржите, а затим превуците прст."\n" Да увећавате или умањујете: трипут додирните и подигните прст."\n\n" Док је приказ увећан, можете:"\n" Да померате приказ: превуците два прста или више њих преко екрана."\n" Да прилагођавате ниво зумирања: скупите или раширите два прста или више њих."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Пречица за приступачност"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Притисните и задржите напајање, па додирните и задржите са два прста"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Искључено"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Када је ова функција укључена, функције приступачности можете брзо да омогућите у два корака:"\n\n"1. корак: Притисните и задржите дугме за напајање док не чујете звук или осетите вибрацију."\n"2. корак: Додирните и задржите са два прста док не чујете звучну потврду."\n\n"Ако постоји више корисника уређаја, помоћу ове пречице на закључаном екрану можете привремено да омогућите приступачност док се уређај не откључа или корисник промени."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Велики текст"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Увеличавање екрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Аутоматски ажурирај увелич. екрана"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8140b2e..4454348 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -717,23 +717,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Välj bakgrund från"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Viloläge"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"När enheten dockas eller laddas i viloläge"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Antingen"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under laddning"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Medan enheten dockas"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Om du vill styra vad som händer när mobilen är dockad och/eller i viloläge aktiverar du Viloläge."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Då ska viloläge aktiveras"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Viloläge nu"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Inställningar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Teckenstorlek"</string>
@@ -1311,14 +1304,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Skärmförstoring"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"När skärmförstoring är på kan du"\n\n" zooma – tryck tre gånger och håll ned."\n" zooma och panorera –  tryck tre gånger, håll ned och dra med fingret"\n" zooma in och ut – tryck tre gånger och släpp."\n\n" När du har zoomat in kan du:"\n" panorera – dra minst två fingrar över skärmen"\n" justera zoomen – nyp eller dra isär med minst två fingrar."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Aktivera tillgänglighet snabbt"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Tryck länge på strömbrytaren, sedan länge med två fingrar"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Av"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Med den här funktionen aktiverad kan du snabbt aktivera tillgänglighetsfunktionerna i två steg:"\n\n"Steg 1: Tryck och håll ned strömbrytaren tills du hör ett ljud eller känner en vibration."\n"Steg 2: Tryck länge med två fingrar tills en bekräftelsesignal hörs."\n\n"Om du använder den här genvägen via låsskärmen på en enhet med flera användare aktiveras tillgänglighetsfunktionerna tillfälligt, tills enheten låses upp eller en annan användare väljs."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Stor text"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Skärmförstoring"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Uppdatera skärmförstoring automatiskt"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index f58d85c..9fb5853 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -718,8 +718,7 @@
     <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Ili kudhibiti kinachotendeka simu inapogatiwa na/au inapolala, washa Modi ya Kulala."</string>
     <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Wakati wa kulala"</string>
     <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Lala sasa"</string>
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Mipangilio"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa maandishi"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukubwa wa fonti"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 82eab49..0935fa3 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"หลังจากไม่ได้ทำงานเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"วอลเปเปอร์"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"เลือกวอลเปเปอร์จาก"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"โหมดสลีป"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"เมื่อวางบนแท่นชาร์จหรืออยู่ในโหมดสลีปและกำลังชาร์จ"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"แบบใดก็ได้"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"ขณะที่ชาร์จ"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"ในขณะวางอยู่บนแท่นชาร์จ"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ปิด"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"หากต้องการควบคุมสิ่งที่จะเกิดขึ้นเมื่อโทรศัพท์วางอยู่บนแท่นชาร์จและ/หรืออยู่ในโหมดสลีป ให้เปิดโหมดสลีปไว้"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"เข้าสู่โหมดสลีปเมื่อใด"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"เข้าสู่โหมดสลีปเลย"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"ปรับความสว่างอัตโนมัติ"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"ระบบ"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"การขยายหน้าจอ"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"เมื่อเปิดแว่นขยายหน้าจออยู่ คุณสามารถ"\n\n" ย่อ/ขยาย: แตะสามครั้งแล้วค้างไว้"\n" ย่อ/ขยายและแพน: แตะสามครั้งแล้วค้างไว้ จากนั้นลากนิ้ว"\n" สลับระหว่างย่อและขยาย: แตะสามครั้งแล้วปล่อย"\n\n" ในขณะที่ขยาย คุณสามารถ:"\n" แพน: ลากโดยใช้สองนิ้วหรือมากกว่าผ่านหน้าจอ"\n" ปรับระดับการย่อ/ขยาย: บีบนิ้วหรือขยายโดยใช้สองนิ้วหรือมากกว่า"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ทางลัดสำหรับการเข้าถึง"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"กดปุ่มเปิด/ปิดค้างไว้ จากนั้นใช้สองนิ้วแตะค้าง"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"ปิด"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"เมื่อเปิดคุณลักษณะนี้ คุณสามารถเปิดใช้งานคุณลักษณะการเข้าถึงได้อย่างรวดเร็วในสองขั้นตอน:"\n\n"ขั้นตอนที่ 1: กดปุ่มเปิด/ปิดค้างไว้จนกว่าคุณจะได้ยินเสียงหรือรู้สึกว่าสั่น"\n"ขั้นตอนที่ 2: ใช้สองนิ้วแตะค้างไว้จนกว่าคุณจะได้ยินเสียงยืนยัน"\n\n"หากมีผู้ใช้อุปกรณ์นี้หลายคน การใช้ทางลัดในหน้าจอล็อกจะเป็นการเปิดใช้งานการเข้าถึงชั่วคราวจนกระทั่งมีการปลดล็อกอุปกรณ์หรือเปลี่ยนผู้ใช้"</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"ข้อความขนาดใหญ่"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"การขยายหน้าจอ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"อัปเดตการขยายหน้าจอโดยอัตโนมัติ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index cc8b4e7..60e2332 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pumili ng wallpaper mula sa"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Sleep Mode"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kapag naka-dock o naka-sleep at nagcha-charge"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Alinman"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Habang nagcha-charge"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Habang naka-dock"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Naka-off"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Upang kontrolin kung ano ang nangyayari kapag naka-dock at/o naka-sleep ang telepono, i-on ang Sleep Mode."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Kailan magsi-sleep"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Mag-sleep ngayon"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Pag-magnify ng screen"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Kapag naka-on ang pag-magnify ng screen, maaari kang"\n\n" Mag-zoom: I-tap nang tatlong beses at i-hold."\n" Mag-zoom at mag-pan: I-tap nang tatlong beses at i-hold, pagkatapos ay i-drag ang iyong daliri."\n" I-toggle ang pag-zoom in o out: I-tap nang tatlong beses at bitawan."\n\n" Habang naka-zoom in ka, maaari kang:"\n" Mag-pan: I-drag ang dalawa o higit pang mga daliri sa kabuuan screen."\n" Ayusin ang antas ng pag-zoom: Paliitin o palawakin gamit ang dalawa o higit pang mga daliri."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Shortcut sa pagiging naa-access"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Pindutin nang matagal ang power, pindutin nang matagal gamit dalawang daliri"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"I-off"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Kapag naka-on ang tampok na ito, mabilisan mong mapapagana ang mga tampok sa pagiging naa-access gamit ang dalawang hakbang:"\n\n"Hakbang 1: Pindutin nang matagal ang power button hanggang sa makarinig ka ng tunog o makaramdam ng vibration."\n"Hakbang 2: Pindutin nang matagal gamit ang dalawang daliri hanggang sa makarinig ka ng kumpirmasyon sa audio."\n\n"Kung maraming user ang device, pansamantalang papaganahin ng paggamit sa shortcut na ito sa lock screen ang pagiging naa-access hanggang sa ma-unlock ang device o mapalitan ang user."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Malaking teksto"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pag-magnify ng screen"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"I-auto update pag-magnify ng screen"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f12349f..cac740a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Duvar Kağıdı"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Şuradan duvar kağıdı seçin:"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Uyku Modu"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Yuvadayken veya uyku modunda ve şarj edilirken"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"İkisinden biri"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Şarj olurken"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Yuvadayken"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Kapalı"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Telefon yuvaya yerleştirildiğinde ve/veya uyku durumunda iken ne olacağını kontrol etmek için Uyku Modunu etkinleştirin."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Uykuya geçme zamanı"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Şimdi uyu"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Ekran büyütme"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Ekran büyütme açıkken şunları yapabilirsiniz:"\n\n" Zum: Üç kere hafifçe vurun ve basılı tutun."\n" Zum ve kaydırma: Üç kere hafifçe vurup basılı tutun ve parmağınızı sürükleyin."\n" Yakınlaştırma ve uzaklaştırma arasında geçiş yapma: Üç kere hafifçe vurun ve bırakın."\n\n" Yakınlaştırmış durumdayken, şunları yapabilirsiniz:"\n" Kaydırma: İki veya daha fazla parmağınızı ekranın üzerinde sürükleyin."\n" Zum seviyesini ayarlama: İki veya daha fazla parmağınızla sıkıştırın veya parmaklarınızı açın."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Erişilebilirlik kısayolu"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Güç düğmesini basılı tutun, sonra iki parmağınızla dokunup bekleyin"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Kapalı"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Bu özellik açıkken, erişilebilirlik özelliklerini iki adımda, hızlı bir şekilde etkinleştirebilirsiniz:"\n\n"1. Adım: Bir ses duyana veya titreşim hissedene kadar güç düğmesini basılı tutun."\n"2. Adım: İki parmağınızla dokunup onay sesi duyana kadar basılı tutun."\n\n"Cihazda birden fazla kullanıcı varsa, kilit ekranında bu kısa yolun kullanılması cihazın kilidi açılana veya kullanıcı değiştirilene kadar erişilebilirlik modunu geçici olarak etkinleştirir."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Büyük metin"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekran büyütme"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekran büyütmeyi otomatik güncelle"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fe1b7cf..7ccb8d3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -717,23 +717,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Після <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Фоновий малюнок"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Вибрати фоновий малюнок з"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Режим сну"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Коли в док-станції або в режимі сну й заряджання"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Будь-який"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Під час заряджання"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Коли в док-станції"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Вимк."</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Щоб контролювати події, коли телефон у док-станції та/або в режимі сну, увімкніть режим сну."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Коли переходити в режим сну"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Перейти в режим сну"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Налаштування"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яскравість"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Розмір шрифту"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Розмір шрифту"</string>
@@ -1311,14 +1304,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Збільшення екрана"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Коли збільшення ввімкнено, можна:"\n\n" масштабувати – тричі торкніться й утримуйте;"\n" масштабувати та панорамувати – тричі торкніться й утримуйте та проведіть пальцем;"\n" наближувати та віддаляти – тричі торкніться й відпустіть."\n\n" Наблизивши, можна:"\n" панорамувати – проведіть пальцями;"\n" налаштовувати масштаб – стисніть або розведіть пальці."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Ярлик доступності"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Натис. і утрим. кнопку живл., потім натис. і утрим. 2 пальцями"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Вимк."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Якщо цю функцію ввімкнено, функції доступності можна швидко ввімкнути двома способами."\n\n"Крок 1. Натисніть і утримуйте кнопку живлення, поки не спрацює звуковий сигнал або вібросигнал."\n"Крок 2. Натисніть і утримуйте двома пальцями, поки не пролунає звукове підтвердження."\n\n"Якщо пристроєм користується декілька осіб, цей ярлик на екрані блокування дозволяє тимчасово ввімкнути доступність, поки пристрій не буде розблоковано або не змінено користувача."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Великий текст"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Збільшення екрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Автоматично оновлювати збільшення"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 3c4ab2c..6509c41 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hình nền"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chọn hình nền từ"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"Chế độ ngủ"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Khi được gắn đế hoặc ở chế độ ngủ và sạc pin"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Hoặc"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Trong khi sạc"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Khi được gắn đế"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Tắt"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Để kiểm soát những gì diễn ra khi điện thoại được gắn đế và/hoặc ở chế độ ngủ, hãy bật Chế độ ngủ."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"Thời điểm ngủ"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"Bắt đầu chế độ ngủ"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Hệ thống"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"Thu phóng màn hình"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"Khi thu phóng màn hình được bật, bạn có thể"\n\n" Thu phóng: Chạm ba lần và giữ."\n" Thu phóng và xoay: Chạm ba lần và giữ; sau đó kéo ngón tay của bạn."\n" Chuyển đổi phóng to hoặc thu nhỏ: Chạm ba lần và nhả."\n\n" Mặc dù bạn đang phóng to, bạn có thể:"\n" Xoay: Kéo hai hoặc nhiều ngón tay qua màn hình."\n" Điều chỉnh mức độ thu phóng: Chụm hoặc mở rộng bằng hai hoặc nhiều ngón tay."</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Phím tắt trợ năng"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"Nhấn và giữ nút nguồn, sau đó chạm và giữ hai ngón tay"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Tắt"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"Khi tính năng này được bật, bạn có thể nhanh chóng bật các tính năng trợ năng bằng hai bước:"\n\n"Bước 1: Nhấn và giữ nút nguồn cho đến khi bạn nghe thấy âm thanh hoặc cảm thấy rung."\n"Bước 2: Chạm và giữ hai ngón tay cho đến nghe thấy xác nhận âm thanh."\n\n"Nếu thiết bị có nhiều người dùng, sử dụng phím tắt này trên màn hình khóa sẽ tạm thời bật trợ năng cho đến khi thiết bị được mở khóa hoặc người dùng được thay đổi."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Chữ lớn"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Thu phóng màn hình"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Tự động cập nhật thu phóng màn hình"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2587c94..62ffe59 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"无操作 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"壁纸"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"选择壁纸来源"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"休眠模式"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"插入基座或休眠且正在充电时"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"任意一种情况"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充电时"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"插入基座时"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"已关闭"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"要控制手机在插入基座时和/或休眠状态下的行为，请启用“休眠模式”。"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"休眠时间"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"立即休眠"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"系统"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"屏幕放大"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"开启屏幕放大功能后，您可以执行以下操作："\n\n"缩放：点按三次并按住。"\n"缩放并平移：点按三次并按住，然后拖动手指。"\n"切换放大或缩小：点按三次然后放开手指。"\n\n"屏幕放大时，您可以执行以下操作："\n"平移：在屏幕上拖动两根或更多根手指。"\n"调整缩放级别：使用两根或更多根手指张合。"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"辅助功能快捷方式"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"按住电源按钮，然后用双指触摸并按住"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"已关闭"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"开启此功能后，您可以通过以下两步操作快速启用辅助功能："\n\n"第 1 步：按住电源按钮，直到您听到提示声或感到振动。"\n"第 2 步：用双指触摸并按住，直到您听到确认声。"\n\n"如果此设备拥有多名用户，那么在锁定屏幕上使用此快捷方式会暂时启用辅助功能，直到此设备解锁或用户切换。"</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"大号字体"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"屏幕放大"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"自动更新屏幕放大状态"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5649fd4..ef63ce8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -717,21 +717,15 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"桌布"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"選擇桌布來源"</string>
-    <!-- no translation found for screensaver_settings_title (830579400192185646) -->
-    <skip />
+    <string name="screensaver_settings_title" msgid="830579400192185646">"休眠模式"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"安置於座架上或休眠及充電時"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"皆可"</string>
-    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
-    <skip />
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充電時"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"安置於座架上時"</string>
-    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_when_to_dream (5319285293085224663) -->
-    <skip />
-    <!-- no translation found for screensaver_settings_dream_start (3897751480634598243) -->
-    <skip />
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"關閉"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"如要控制手機安置於座架上和/或休眠時的設定，請開啟休眠模式。"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="5319285293085224663">"休眠時機"</string>
+    <string name="screensaver_settings_dream_start" msgid="3897751480634598243">"立即休眠"</string>
     <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
@@ -1311,14 +1305,10 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"系統"</string>
     <string name="accessibility_screen_magnification_title" msgid="159538947700130120">"螢幕放大"</string>
     <string name="accessibility_screen_magnification_summary" msgid="7705945119921468241">"開啟螢幕放大功能時，您可以："\n\n" 縮放：輕按三下並按住。"\n" 縮放並平移：輕按三下並按住，然後拖曳手指。"\n" 切換縮放：輕按三下，然後放開手指。"\n\n" 螢幕放大時，您可以："\n" 平移：使用兩根以上手指在螢幕上拖曳。"\n" 調整縮放等級：使用兩根以上手指在螢幕上撥動或展開。"</string>
-    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_on (5107177518892413423) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
-    <skip />
-    <!-- no translation found for accessibility_global_gesture_preference_description (7636553304145674166) -->
-    <skip />
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"協助工具捷徑"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="5107177518892413423">"持續按住電源按鈕，然後使用兩指輕觸並按住"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"關閉"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="7636553304145674166">"開啟這項功能時，您可以透過兩個步驟快速啟用協助工具功能："\n\n"步驟 1：持續按住電源按鈕，直到聽見音效或感到震動。"\n"步驟 2：使用兩指輕觸並按住，直到聽見確認音效。"\n\n"如有多位使用者共用裝置，在鎖定畫面上使用這個捷徑會暫時啟用協助工具，直到裝置遭到解鎖或使用者發生變更為止。"</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"大字體"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"螢幕放大"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"自動更新螢幕放大設定"</string>
@@ -1587,8 +1577,8 @@
     <string name="background_data_dialog_title" msgid="6059217698124786537">"您要停用背景資料嗎？"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"停用背景資料可延長電池使用時間，並減少資料的傳輸量。但某些應用程式可能仍會使用背景資料連線。"</string>
     <string name="sync_automatically" msgid="1682730255435062059">"自動同步處理應用程式的資料"</string>
-    <string name="add_account_shared_system_warning" product="tablet" msgid="3385757125975372772">"提醒：共用平板電腦就像共用電腦一樣，有一定程度的風險，其他使用者可能找到方法存取您儲存在這部平板電腦上的資料。"</string>
-    <string name="add_account_shared_system_warning" product="default" msgid="2481548364278168869">"提醒：共用手機就像共用電腦一樣，有一定程度的風險，其他使用者可能找到方法存取您儲存在這支手機上的資料。"</string>
+    <string name="add_account_shared_system_warning" product="tablet" msgid="3385757125975372772">"提醒：共用平板電腦就像共用電腦一樣，都有一定程度的風險，其他使用者可能會找出方法存取您儲存在這部平板電腦上的資料。"</string>
+    <string name="add_account_shared_system_warning" product="default" msgid="2481548364278168869">"提醒：共用手機就像共用電腦一樣，都有一定程度的風險，其他使用者可能會找出方法存取您儲存在這支手機上的資料。"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"已開啟同步處理功能"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"已關閉同步處理功能"</string>
     <string name="sync_error" msgid="5060969083117872149">"同步處理錯誤"</string>
@@ -1828,10 +1818,10 @@
     <string name="user_new_user_name" msgid="369856859816028856">"新使用者"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"您要刪除自己嗎？"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"移除使用者？"</string>
-    <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"您將會失去自己在這部平板電腦上的空間和資料，這個動作無法復原。"</string>
-    <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"您將會失去自己在這支手機上的空間和資料，這個動作無法復原。"</string>
-    <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"這位使用者在這台平板電腦上的空間和資料將會消失，這個動作無法復原。"</string>
-    <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"這位使用者在這支手機上的空間和資料將會消失，這個動作無法復原。"</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"您在這台平板電腦上的可用空間和資料將會消失，這個動作無法復原。"</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"您在這支手機上的可用空間和資料將會消失，這個動作無法復原。"</string>
+    <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"這位使用者在這台平板電腦上的可用空間和資料將會消失，這個動作無法復原。"</string>
+    <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"這位使用者在這支手機上的可用空間和資料將會消失，這個動作無法復原。"</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"正在新增使用者…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"刪除使用者"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"刪除"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1f94287..f66ca3a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3091,20 +3091,9 @@
     <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
     <string name="accessibility_system_title">System</string>
     <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
-    <string name="accessibility_screen_magnification_title">Screen magnification</string>
+    <string name="accessibility_screen_magnification_title">Magnification gestures</string>
     <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
-    <string name="accessibility_screen_magnification_summary">
-        When screen magnification is on, you can\:\n\n
-
-        Zoom: Triple-tap &amp; hold.\n
-        Zoom &amp; pan: Triple-tap &amp; hold, then drag your finger.\n
-        Toggle zoom in or out: Triple tap &amp; release.\n\n
-
-        While you\'re zoomed in, you can:\n
-
-        Pan: Drag two or more fingers across the screen.\n
-        Adjust zoom level: Pinch or expand using two or more fingers.
-    </string>
+    <string name="accessibility_screen_magnification_summary">When this feature is turned on, you can zoom in and out by triple-tapping the screen.\n\nWhile zoomed in, you can:\n<ul><li>Pan: Drag two or more fingers across the screen.</li>\n<li>Adjust zoom level: Pinch two or more fingers together or spread them apart.</li></ul>\n\nYou can also temporarily magnify what\'s under your finger by triple-tapping and holding. In this magnified state, you can drag your finger to explore different parts of the screen. Lift your finger to return to your previous state.\n\nNote: Triple-tap for magnification works everywhere except the keyboard and navigation bar.</string>
     <!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] -->
     <string name="accessibility_global_gesture_preference_title">Accessibility shortcut</string>
     <!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] -->
@@ -3112,7 +3101,7 @@
     <!-- Summary for the preference screen to enable the global geture that turns on accessibility (off state). [CHAR LIMIT=35] -->
     <string name="accessibility_global_gesture_preference_summary_off">Off</string>
     <!--  Description for the preference screen to enable the global geture taht turns on accessibility. [CHAR LIMIT=none] -->
-    <string name="accessibility_global_gesture_preference_description">When this feature is turned on, you can quickly enable accessibility features in two steps:\n\nStep 1: Press and hold the power button until you hear a sound or feel a vibration.\nStep 2: Touch and hold two fingers until you hear audio confirmation.\n\nIf the device has multiple users, using this shortcut on the lock screen temporarily enables accessibility until the device is unlocked or the user is changed.</string>
+    <string name="accessibility_global_gesture_preference_description">When this feature is turned on, you can quickly enable accessibility features in two steps:\n\nStep 1: Press and hold the power button until you hear a sound or feel a vibration.\n\nStep 2: Touch and hold two fingers until you hear audio confirmation.\n\nIf the device has multiple users, using this shortcut on the lock screen temporarily enables accessibility until the device is unlocked.</string>
     <!-- Title for the accessibility preference to enable large text. [CHAR LIMIT=35] -->
     <string name="accessibility_toggle_large_text_preference_title">Large text</string>
     <!-- Title for the accessibility preference to enable screen magnification. [CHAR LIMIT=35] -->
@@ -3776,10 +3765,7 @@
     <string name="background_data_dialog_message">Disabling background data extends battery life and lowers data use. Some apps may still use the background data connection.</string>
     <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
     <string name="sync_automatically">Auto-sync app data</string>
-    <!-- Account creation warning in multi-user tablets [CHAR LIMIT=none] -->
-    <string name="add_account_shared_system_warning" product="tablet">Reminder: As with any shared computer, there is some risk that other users may find a way to access your data on this tablet.</string>
-    <!-- Account creation warning in multi-user phones[CHAR LIMIT=none] -->
-    <string name="add_account_shared_system_warning" product="default">Reminder: As with any shared computer, there is some risk that other users may find a way to access your data on this phone.</string>
+
     <!-- Sync status messages on Accounts & Synchronization settings --><skip />
     <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
     <string name="sync_enabled">Sync is ON</string>
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index 590eb95..c95596b 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -27,18 +27,6 @@
             android:persistent="false"/>
 
         <PreferenceScreen
-           android:key="choose_lockscreen_status_widget"
-           android:title="@string/choose_lockscreen_status_widget_picker_title"
-           android:summary=""
-           android:persistent="false"/>
-
-        <PreferenceScreen
-           android:key="choose_user_selected_lockscreen_widget"
-           android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
-           android:summary=""
-           android:persistent="false"/>
-
-        <PreferenceScreen
             android:key="biometric_weak_improve_matching"
             android:title="@string/biometric_weak_improve_matching_title"/>
 
@@ -68,6 +56,18 @@
             android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
 
         <PreferenceScreen
+           android:key="choose_lockscreen_status_widget"
+           android:title="@string/choose_lockscreen_status_widget_picker_title"
+           android:summary=""
+           android:persistent="false"/>
+
+        <PreferenceScreen
+           android:key="choose_user_selected_lockscreen_widget"
+           android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
+           android:summary=""
+           android:persistent="false"/>
+
+        <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
             android:title="@string/owner_info_settings_title"
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index 5f8425c..a9973fd 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -26,18 +26,6 @@
             android:summary="@string/unlock_set_unlock_mode_password"
             android:persistent="false"/>
 
-        <PreferenceScreen
-           android:key="choose_lockscreen_status_widget"
-           android:title="@string/choose_lockscreen_status_widget_picker_title"
-           android:summary=""
-           android:persistent="false"/>
-
-        <PreferenceScreen
-           android:key="choose_user_selected_lockscreen_widget"
-           android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
-           android:summary=""
-           android:persistent="false"/>
-
         <ListPreference
             android:key="lock_after_timeout"
             android:title="@string/lock_after_timeout"
@@ -51,6 +39,18 @@
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
         <PreferenceScreen
+           android:key="choose_lockscreen_status_widget"
+           android:title="@string/choose_lockscreen_status_widget_picker_title"
+           android:summary=""
+           android:persistent="false"/>
+
+        <PreferenceScreen
+           android:key="choose_user_selected_lockscreen_widget"
+           android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
+           android:summary=""
+           android:persistent="false"/>
+
+        <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
             android:title="@string/owner_info_settings_title"
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index f8f2ee7..47fa1cc 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -26,18 +26,6 @@
             android:summary="@string/unlock_set_unlock_mode_pattern"
             android:persistent="false"/>
 
-        <PreferenceScreen
-           android:key="choose_lockscreen_status_widget"
-           android:title="@string/choose_lockscreen_status_widget_picker_title"
-           android:summary=""
-           android:persistent="false"/>
-
-        <PreferenceScreen
-           android:key="choose_user_selected_lockscreen_widget"
-           android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
-           android:summary=""
-           android:persistent="false"/>
-
         <CheckBoxPreference
             android:key="visiblepattern"
             android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
@@ -59,6 +47,18 @@
             android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
 
         <PreferenceScreen
+           android:key="choose_lockscreen_status_widget"
+           android:title="@string/choose_lockscreen_status_widget_picker_title"
+           android:summary=""
+           android:persistent="false"/>
+
+        <PreferenceScreen
+           android:key="choose_user_selected_lockscreen_widget"
+           android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
+           android:summary=""
+           android:persistent="false"/>
+
+        <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
             android:title="@string/owner_info_settings_title"
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index 8f5cdc2..a019125 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -26,18 +26,6 @@
             android:summary="@string/unlock_set_unlock_mode_pin"
             android:persistent="false"/>
 
-        <PreferenceScreen
-           android:key="choose_lockscreen_status_widget"
-           android:title="@string/choose_lockscreen_status_widget_picker_title"
-           android:summary=""
-           android:persistent="false"/>
-
-        <PreferenceScreen
-           android:key="choose_user_selected_lockscreen_widget"
-           android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
-           android:summary=""
-           android:persistent="false"/>
-
         <ListPreference
             android:key="lock_after_timeout"
             android:title="@string/lock_after_timeout"
@@ -55,6 +43,18 @@
             android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
 
         <PreferenceScreen
+           android:key="choose_lockscreen_status_widget"
+           android:title="@string/choose_lockscreen_status_widget_picker_title"
+           android:summary=""
+           android:persistent="false"/>
+
+        <PreferenceScreen
+           android:key="choose_user_selected_lockscreen_widget"
+           android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
+           android:summary=""
+           android:persistent="false"/>
+
+        <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
             android:title="@string/owner_info_settings_title"
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 266621f..d64a092 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -282,7 +282,7 @@
         Bundle extras = mDisplayMagnificationPreferenceScreen.getExtras();
         extras.putString(EXTRA_TITLE, getString(
                 R.string.accessibility_screen_magnification_title));
-        extras.putString(EXTRA_SUMMARY, getString(
+        extras.putCharSequence(EXTRA_SUMMARY, getActivity().getResources().getText(
                 R.string.accessibility_screen_magnification_summary));
         extras.putBoolean(EXTRA_CHECKED, Settings.Secure.getInt(getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1);
@@ -1005,7 +1005,7 @@
                 getActivity().getActionBar().setTitle(title);
             }
             // Summary.
-            String summary = arguments.getString(EXTRA_SUMMARY);
+            CharSequence summary = arguments.getCharSequence(EXTRA_SUMMARY);
             mSummaryPreference.setSummary(summary);
         }
     }
diff --git a/src/com/android/settings/AppWidgetPickActivity.java b/src/com/android/settings/AppWidgetPickActivity.java
index 97f816a..953d10c 100644
--- a/src/com/android/settings/AppWidgetPickActivity.java
+++ b/src/com/android/settings/AppWidgetPickActivity.java
@@ -269,7 +269,7 @@
         // If not specified, we don't filter on any specific
         int featuresFilter = AppWidgetProviderInfo.WIDGET_FEATURES_NONE;
         if (intent.getExtras().containsKey(AppWidgetManager.EXTRA_FEATURES_FILTER)) {
-            featuresFilter = intent.getExtras().getInt(AppWidgetManager.EXTRA_CATEGORY_FILTER);
+            featuresFilter = intent.getExtras().getInt(AppWidgetManager.EXTRA_FEATURES_FILTER);
         }
 
         putInstalledAppWidgets(items, categoryFilter, featuresFilter);
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 4657be5..aab4ba6 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -40,6 +40,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.View.OnClickListener;
+import android.view.accessibility.AccessibilityEvent;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.TextView;
@@ -272,8 +273,15 @@
         }
 
         protected void updateStage(Stage stage) {
+            final Stage previousStage = mUiStage;
             mUiStage = stage;
             updateUi();
+
+            // If the stage changed, announce the header for accessibility. This
+            // is a no-op when accessibility is disabled.
+            if (previousStage != stage) {
+                mHeaderText.announceForAccessibility(mHeaderText.getText());
+            }
         }
 
         /**
@@ -378,8 +386,8 @@
                 errorMsg = validatePassword(pin);
                 if (errorMsg == null) {
                     mFirstPin = pin;
-                    updateStage(Stage.NeedToConfirm);
                     mPasswordEntry.setText("");
+                    updateStage(Stage.NeedToConfirm);
                 }
             } else if (mUiStage == Stage.NeedToConfirm) {
                 if (mFirstPin.equals(pin)) {
@@ -389,11 +397,11 @@
                     mLockPatternUtils.saveLockPassword(pin, mRequestedQuality, isFallback);
                     getActivity().finish();
                 } else {
-                    updateStage(Stage.ConfirmWrong);
                     CharSequence tmp = mPasswordEntry.getText();
                     if (tmp != null) {
                         Selection.setSelection((Spannable) tmp, 0, tmp.length());
                     }
+                    updateStage(Stage.ConfirmWrong);
                 }
             }
             if (errorMsg != null) {
@@ -415,6 +423,7 @@
 
         private void showError(String msg, final Stage next) {
             mHeaderText.setText(msg);
+            mHeaderText.announceForAccessibility(mHeaderText.getText());
             Message mesg = mHandler.obtainMessage(MSG_SHOW_ERROR, next);
             mHandler.removeMessages(MSG_SHOW_ERROR);
             mHandler.sendMessageDelayed(mesg, ERROR_MESSAGE_TIMEOUT);
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 180eee1..295e8ea 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -429,6 +429,7 @@
          * @param stage
          */
         protected void updateStage(Stage stage) {
+            final Stage previousStage = mUiStage;
 
             mUiStage = stage;
 
@@ -493,6 +494,12 @@
                 case ChoiceConfirmed:
                     break;
             }
+
+            // If the stage changed, announce the header for accessibility. This
+            // is a no-op when accessibility is disabled.
+            if (previousStage != stage) {
+                mHeaderText.announceForAccessibility(mHeaderText.getText());
+            }
         }
 
 
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 1229046..96839ba 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -35,6 +35,7 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityEvent;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.TextView;
@@ -173,6 +174,7 @@
 
         private void showError(int msg) {
             mHeaderText.setText(msg);
+            mHeaderText.announceForAccessibility(mHeaderText.getText());
             mPasswordEntry.setText(null);
             mHandler.postDelayed(new Runnable() {
                 public void run() {
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index 2892930..dd375cc 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -180,7 +180,6 @@
         }
 
         private void updateStage(Stage stage) {
-
             switch (stage) {
                 case NeedToUnlock:
                     if (mHeaderText != null) {
@@ -220,6 +219,10 @@
                     mLockPatternView.setEnabled(false); // appearance of being disabled
                     break;
             }
+
+            // Always announce the header for accessibility. This is a no-op
+            // when accessibility is disabled.
+            mHeaderTextView.announceForAccessibility(mHeaderTextView.getText());
         }
 
         private Runnable mClearPatternRunnable = new Runnable() {
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 5872a05..75d905d 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -245,7 +245,6 @@
      */
     private void notifyUser() {
         if (mNotificationCountdown > 0) {
-            Log.d(TAG, "Counting down to notify user..." + mNotificationCountdown);
             --mNotificationCountdown;
         } else if (mAudioManager != null) {
             Log.d(TAG, "Notifying user that we are waiting for input...");
@@ -724,7 +723,6 @@
      * Listen to key events so we can disable sounds when we get a keyinput in EditText.
      */
     private void delayAudioNotification() {
-        Log.d(TAG, "User entering password: delay audio notification");
         mNotificationCountdown = 20;
     }
 
diff --git a/src/com/android/settings/LocalePicker.java b/src/com/android/settings/LocalePicker.java
index 1272ddc..0afa4d5 100644
--- a/src/com/android/settings/LocalePicker.java
+++ b/src/com/android/settings/LocalePicker.java
@@ -17,9 +17,7 @@
 package com.android.settings;
 
 import android.app.Dialog;
-import android.content.Context;
 import android.os.Bundle;
-import android.os.UserManager;
 import android.util.Log;
 
 import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
@@ -78,11 +76,12 @@
         mDialogFragment.show(getActivity().getFragmentManager(), Integer.toString(dialogId));
     }
 
-    public Dialog onCreateDialog(int dialogId) {
+    public Dialog onCreateDialog(final int dialogId) {
         return Utils.buildGlobalChangeWarningDialog(getActivity(),
                 R.string.global_locale_change_title,
                 new Runnable() {
                     public void run() {
+                        removeDialog(dialogId);
                         getActivity().onBackPressed();
                         LocalePicker.updateLocale(mTargetLocale);
                     }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index c2b5cc1..9c7f848 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -750,6 +750,8 @@
 
     @Override
     public void onAccountsUpdated(Account[] accounts) {
+        // TODO: watch for package upgrades to invalidate cache; see 7206643
+        mAuthenticatorHelper.updateAuthDescriptions(this);
         mAuthenticatorHelper.onAccountsUpdated(this, accounts);
         invalidateHeaders();
     }
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index dffb1ee..e0fe629 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -22,25 +22,18 @@
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
 import android.app.PendingIntent;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.DialogInterface.OnDismissListener;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 
 import com.android.settings.Utils;
-import com.android.settings.R;
 
 import java.io.IOException;
 
 /**
  * Entry point Actiivty for account setup. Works as follows
- * 0) If it is a multi-user system with multiple users, it shows a warning dialog first.
- *    If the user accepts this warning, it moves on to step 1.
+ *
  * 1) When the other Activities launch this Activity, it launches {@link ChooseAccountActivity}
  *    without showing anything.
  * 2) After receiving an account type from ChooseAccountActivity, this Activity launches the
@@ -65,7 +58,6 @@
      * application.
      */
     private static final String KEY_CALLER_IDENTITY = "pendingIntent";
-    private static final String KEY_SHOWED_WARNING = "showedWarning";
 
     private static final String TAG = "AccountSettings";
 
@@ -76,8 +68,6 @@
 
     private static final int CHOOSE_ACCOUNT_REQUEST = 1;
 
-    private static final int DLG_MULTIUSER_WARNING = 1;
-
     private PendingIntent mPendingIntent;
 
     private AccountManagerCallback<Bundle> mCallback = new AccountManagerCallback<Bundle>() {
@@ -105,57 +95,21 @@
     };
 
     private boolean mAddAccountCalled = false;
-    private boolean mShowedMultiuserWarning;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         if (savedInstanceState != null) {
-            mShowedMultiuserWarning = savedInstanceState.getBoolean(KEY_SHOWED_WARNING);
             mAddAccountCalled = savedInstanceState.getBoolean(KEY_ADD_CALLED);
             if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "restored");
         }
 
-        if (!Utils.hasMultipleUsers(this)) {
-            mShowedMultiuserWarning = true;
+        if (mAddAccountCalled) {
+            // We already called add account - maybe the callback was lost.
+            finish();
+            return;
         }
-
-        // Show the multiuser warning dialog first. If that was already shown and accepted,
-        // then show the account type chooser.
-        if (!mShowedMultiuserWarning) {
-            showMultiuserWarning();
-        } else {
-            if (mAddAccountCalled) {
-                // We already called add account - maybe the callback was lost.
-                finish();
-                return;
-            }
-            showChooseAccount();
-        }
-    }
-
-    private void showMultiuserWarning() {
-        showDialog(DLG_MULTIUSER_WARNING);
-    }
-
-    public Dialog onCreateDialog(int dlgId) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setMessage(R.string.add_account_shared_system_warning);
-        builder.setPositiveButton(android.R.string.ok, mDialogClickListener);
-        builder.setNegativeButton(android.R.string.cancel, mDialogClickListener);
-        builder.setOnDismissListener(new OnDismissListener() {
-            public void onDismiss(DialogInterface di) {
-                if (!mShowedMultiuserWarning) {
-                    setResult(RESULT_CANCELED);
-                    finish();
-                }
-            }
-        });
-        return builder.create();
-    }
-
-    private void showChooseAccount() {
         final String[] authorities =
                 getIntent().getStringArrayExtra(AccountPreferenceBase.AUTHORITIES_FILTER_KEY);
         final String[] accountTypes =
@@ -188,7 +142,6 @@
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putBoolean(KEY_ADD_CALLED, mAddAccountCalled);
-        outState.putBoolean(KEY_SHOWED_WARNING, mShowedMultiuserWarning);
         if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "saved");
     }
 
@@ -207,17 +160,4 @@
                 null /* handler */);
         mAddAccountCalled  = true;
     }
-
-    private OnClickListener mDialogClickListener = new OnClickListener() {
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            if (which == Dialog.BUTTON_POSITIVE) {
-                mShowedMultiuserWarning = true;
-                showChooseAccount();
-            } else if (which == Dialog.BUTTON_NEGATIVE) {
-                setResult(RESULT_CANCELED);
-                finish();
-            }
-        }
-    };
 }
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 55f18d2..1cdb4dc 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -110,6 +110,8 @@
     private ApplicationsState mState;
     private ApplicationsState.Session mSession;
     private ApplicationsState.AppEntry mAppEntry;
+    private boolean mInitialized;
+    private boolean mShowUninstalled;
     private PackageInfo mPackageInfo;
     private CanBeOnSdCardChecker mCanBeOnSdCardChecker;
     private View mRootView;
@@ -462,7 +464,7 @@
             showIt = false;
         } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
             showIt = false;
-        } else if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
+        } else if (mPackageInfo == null || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
             showIt = false;
         } else if (UserHandle.myUserId() != 0) {
             showIt = false;
@@ -767,6 +769,17 @@
         setAppLabelAndIcon(mPackageInfo);
         refreshButtons();
         refreshSizeInfo();
+
+        if (!mInitialized) {
+            // First time init: are we displaying an uninstalled app?
+            mInitialized = true;
+            mShowUninstalled = (mAppEntry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0;
+        } else if (!mShowUninstalled) {
+            // All other times: if we did not start out with the app uninstalled,
+            // then if it becomes uninstalled we want to go away.
+            return (mAppEntry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0;
+        }
+
         return true;
     }