diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6e01aec..4f31845 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -561,6 +561,23 @@
                 android:resource="@id/sound_settings" />
         </activity-alias>
 
+        <activity android:name="Settings$ZenModeSettingsActivity"
+                android:label="@string/zen_mode_settings_title"
+                android:exported="true"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.ZEN_MODE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.ZenModeSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/sound_settings" />
+        </activity>
+
         <activity android:name="Settings$DisplaySettingsActivity"
                 android:label="@string/display_settings"
                 android:taskAffinity=""
@@ -1295,6 +1312,7 @@
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
                 <action android:name="android.bluetooth.device.action.PAIRING_CANCEL" />
+                <action android:name="android.bluetooth.device.action.BOND_STATE_CHANGED" />
             </intent-filter>
         </receiver>
 
@@ -1535,12 +1553,10 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="com.android.settings.Settings$ChooseAccountActivity"
+        <activity android:name="com.android.settings.accounts.ChooseAccountActivity"
             android:label="@string/header_add_an_account"
-            android:configChanges="orientation|keyboardHidden|screenSize">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.accounts.ChooseAccountFragment" />
-        </activity>
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
 
         <activity android:name=".CryptKeeper"
                   android:immersive="true"
diff --git a/res/drawable-hdpi/spinner_default_holo_dark_am_no_underline.9.png b/res/drawable-hdpi/spinner_default_holo_dark_am_no_underline.9.png
new file mode 100644
index 0000000..267e7ba
--- /dev/null
+++ b/res/drawable-hdpi/spinner_default_holo_dark_am_no_underline.9.png
Binary files differ
diff --git a/res/drawable-mdpi/spinner_default_holo_dark_am_no_underline.9.png b/res/drawable-mdpi/spinner_default_holo_dark_am_no_underline.9.png
new file mode 100644
index 0000000..db51f6b
--- /dev/null
+++ b/res/drawable-mdpi/spinner_default_holo_dark_am_no_underline.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/spinner_default_holo_dark_am_no_underline.9.png b/res/drawable-xhdpi/spinner_default_holo_dark_am_no_underline.9.png
new file mode 100644
index 0000000..8d22ce2
--- /dev/null
+++ b/res/drawable-xhdpi/spinner_default_holo_dark_am_no_underline.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/spinner_default_holo_dark_am_no_underline.9.png b/res/drawable-xxhdpi/spinner_default_holo_dark_am_no_underline.9.png
new file mode 100644
index 0000000..29fb50f
--- /dev/null
+++ b/res/drawable-xxhdpi/spinner_default_holo_dark_am_no_underline.9.png
Binary files differ
diff --git a/res/layout/preference_zen_mode.xml b/res/layout/preference_zen_mode.xml
new file mode 100644
index 0000000..4139d40
--- /dev/null
+++ b/res/layout/preference_zen_mode.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/configure_zen_mode"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical"
+    android:padding="8dip"
+    android:visibility="gone"
+    android:background="?android:attr/selectableItemBackground"
+    android:src="@drawable/ic_bt_config"
+    android:contentDescription="@string/configure_zen_mode_description" />
diff --git a/res/layout/settings_main.xml b/res/layout/settings_main.xml
index f34ece8..8b98794 100644
--- a/res/layout/settings_main.xml
+++ b/res/layout/settings_main.xml
@@ -76,6 +76,6 @@
               android:layout_width="300dp"
               android:layout_height="match_parent"
               android:layout_gravity="start"
-              android:background="#ff333333"/>
+              android:background="@color/background_drawer"/>
 
 </android.support.v4.widget.DrawerLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 44aae6b..57bff57 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Jou tablet en persoonlike inligting is meer blootgestel aan aanvalle van programme uit onbekende bronne. Jy stem in dat slegs jy verantwoordelik is vir enige skade aan jou tablet of verlies van data weens die gebruik van hierdie programme."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Jou selfoon en persoonlike inligting is meer kwesbaar vir aanvalle deur programme van onbekende bronne. Jy stem saam dat slegs jy verantwoordelik is vir enige skade aan jou foon of verlies van data weens die gebruik van hierdie programme."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verifieer programme"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Weier of waarsku voor programme geïnstalleer word wat skade kan veroorsaak"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Gaan alle programme gereeld na en weier of stuur \'n waarskuwing oor die programme wat skade kan aanrig"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Gevorderde instellings"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktiveer meer instellingsopsies"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Programinligting"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Stemoproepe"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ledig"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Foon ledig"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Onverklaarde"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Oorbereken"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-voorgrond"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Kies batterybesparende modus"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Die program kan dalk instellings bied om batterygebruik te verminder"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Battery deur gebruiker gebruik"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Onverklaarde kragverbruik"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oorberekende kragverbruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedert uitgeprop is"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Maak navigasielaai oop"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Maak navigasielaai toe"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Oorsig"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Wys kennisgewings"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Sensitiewe kennisgewing-inhoud sal versteek word wanneer gesluit"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Alle kennisgewing-inhoud sal gewys word wanneer gesluit"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 16f837c..8b8e8f4 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -331,8 +331,8 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ማመስጠሪያ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ጡባዊ አመስጥር"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ስልክ አመስጥር"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ጡባዊዎን ባበሩ ቁጥር ለመፍታት የቁጥር PIN  ወይም ይለፍ ቃል ጠይቅ"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ስልክዎን በአበሩ ቁጥር ለመፍታት የቁጥር PIN  ወይም ይለፍ ቃል ጠይቅ"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ጡባዊዎን ባበሩ ቁጥር ለመፍታት የቁጥር ፒን   ወይም ይለፍ ቃል ጠይቅ"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ስልክዎን በአበሩ ቁጥር ለመፍታት የቁጥር ፒን   ወይም ይለፍ ቃል ጠይቅ"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ተመሳጥሯል"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ማህደረ መረጃ ፣እና ሌላ ፋይሎች ማመሳጠር ይችላሉ። ጡባዊ ተኮዎን ምስጠራ አፈታት አንዴ ካደረጉ በኋላ፣በእያንዳንዱ ጊዜ ሲያበሩት ላለማመሳጠር የቁጥር ፒን ወይም የይለፍ ቃል መተየብ ያስፈልግዎታል፡- የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ጡባዊ ተኮዎን አለማመሳጠር አይችሉም፤ሁሉንም ውሂብ በማጥፋት።\n\n ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብዎ እና ምስጠራ እስኪጠናቀቅ ጡባዊ ተኮዎ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጡ፣ውሂብዎን አንዳንዱን ወይም ሁሉንም ያጣሉ።"</string>
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ማህደረ  መረጃ ፣እና ሌላ ፋይሎች ማመሳጠር ትችላለህ።  ስልክህን ምስጠራ አፈታት አንዴ ካደረክ በኋላ፣በእያንዳንዱ ጊዜ ስታበራው ላለማመሳጠር የቁጥር ፕን ወይም የይለፍ ቃል መተየብ ያስፈልግሃል። የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ስልክህን አለማመሳጠር አትችልም፤ሁሉንም ውሂብ በማጥፋት።\n\n ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብህ እና ምስጠራ እስኪጠናቀቅ ስልክህ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጥክ፣ውሂብህን አንዳንዱን ወይም ሁሉንም ታጣለህ።"</string>
@@ -340,8 +340,8 @@
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ስልክ አመስጥር"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"እባክዎ ባትሪዎን ኃይል ይሙላ እና እንደገና ይሞክሩ።"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"እባክዎ የኃይል መሙያዎን ይሰኩ እና እንደገና ይሞክሩ።"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ምንም የማያቆልፍ PIN ወይም ይለፍቃል የለም"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ምስጠራ ከመጀመርህ በፊት የማያ ቆልፍ PIN ወይም ይለፍቃል ማዘጋጀት አለብህ።"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ምንም የማያቆልፍ ፒን  ወይም ይለፍቃል የለም"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ምስጠራ ከመጀመርህ በፊት የማያ ቆልፍ ፒን  ወይም ይለፍቃል ማዘጋጀት አለብህ።"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"ይመስጠር?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጥከው፤ ውሂብ ታጣለህ።ምስጠራ ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ጡባዊ ተኮው ብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጥከው፤ ውሂብ ታጣለህ።ምስጠራ ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ስልኩ ለብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
@@ -358,7 +358,7 @@
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"ምትኬ ቆላፊ ምረጥ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ማሳያ መቆለፊያ"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ማሳያ ቆልፍን ለውጥ"</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"ስርዓተ ጥለት፣  PIN፣ ወይም የይለፍ ቃል ለውጥ ወይም አቦዝን"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"ስርዓተ ጥለት፣  ፒን ፣ ወይም የይለፍ ቃል ለውጥ ወይም አቦዝን"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"ማያውን ለመቆለፍ ሜተድ ምረጥ"</string>
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"በፊት ገጽ መክፈቻ እርስዎን ማየት ሳይችል ሲቀር ስልኩን እንዴት ማስከፈት ይፈልጋሉ?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"ምንም"</string>
@@ -369,7 +369,7 @@
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"ዝቅተኛ ጥበቃ፣ ሙከራ"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"ስርዓተ ጥለት"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"መካከለኛ ጥበቃ"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"ፒን"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ከመካከለኛ እስከ ከፍተኛ ጥበቃ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">" የይለፍ ቃል፡"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ከፍተኛ ጥበቃ"</string>
@@ -382,18 +382,18 @@
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"የይለፍ ቃል"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"የማያ መዝጊያ አጥፋ"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"የመክፈቻ ስርዓተ ጥለት አስወግድ"</string>
-    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"መክፈቻ PIN አስወግድ"</string>
+    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"መክፈቻ ፒን  አስወግድ"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"የመክፈቻ ይለፍ ቃል አስወግድ"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"መክፈቻ ስርዓት ጥለት ለውጥ"</string>
-    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"መክፈቻ PIN ለውጥ"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"መክፈቻ ፒን  ለውጥ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"መክፈቻ ይለፍ ቃል ለውጥ"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"የይለፍ ቃል ቢያንስ %d ቁምፊዎች መሆን አለበት"</string>
-    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN ቢያንስ %d አሃዞች መሆን አለበት"</string>
-    <string name="lockpassword_press_continue" msgid="122706614386757182">"ሲያልቅ ቀጥል ንካ"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"ፒን  ቢያንስ %d አሃዞች መሆን አለበት"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"ሲከናወን ቀጥል ንካ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ቀጥል"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"የይለፍ ቃል ከ<xliff:g id="NUMBER">%d</xliff:g> ቁምፊዎች ያነሰ መሆን አለበት።"</string>
-    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN ከ<xliff:g id="NUMBER">%d</xliff:g> አሀዞች ያነሰ መሆን አለበት።"</string>
-    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN ከ0-9 አሀዞች ብቻ መያዝ አለበት።"</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"ፒን  ከ<xliff:g id="NUMBER">%d</xliff:g> አሀዞች ያነሰ መሆን አለበት።"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"ፒን  ከ0-9 አሀዞች ብቻ መያዝ አለበት።"</string>
     <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"የቅርብ ጊዜ ፒን መጠቀም የመሳሪያ አስተዳዳሪ አይፈቅድም።"</string>
     <string name="lockpassword_illegal_character" msgid="8742901630116866738">"የይለፍ ቃል ህገ ወጥ ቁምፊ ይዟል።"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"የይለፍ ቃል ቢያንስ አንድ ፊደል መያዝ አለበት።"</string>
@@ -449,9 +449,9 @@
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"የብሉቱዝ ማጣመሪያ ጥየቃ"</string>
     <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"ከ:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ጋር ለማጣመር የመሣሪያውን የሚፈለገውን ፒን ተይብ:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"ከ:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ጋር ለማጣመር የመሣሪያውን የሚፈለገውን የይለፍ ቁልፍ ተይብ:"</string>
-    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN ፊደሎች ወይም ምልክቶች ይይዛል"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"ፒን  ፊደሎች ወይም ምልክቶች ይይዛል"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"አብዛኛውን ጊዜ 0000 ወይም 1234"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"ይህን PIN በሌላ መሣሪያ ላይማስገባት ሊያስፈልግህ ይችላል።"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"ይህን ፒን  በሌላ መሣሪያ ላይማስገባት ሊያስፈልግህ ይችላል።"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"ይህን የይለፍ ቁልፍ በሌላ መሣሪያ ላይማስገባት ሊያስፈልግህ ይችላል።"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ጋር ለማገናኘት ይህን የይለፍ ቁልፍ ማሳየቱን አረጋግጥ፡&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ከዚህ መሣሪያ ጋር ይጣመር?"</string>
@@ -766,22 +766,22 @@
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"የSIM ካርድ መቆለፊያ አዘጋጅ"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM ካርድቆልፍ"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM ካርድ ቆልፍ"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ጡባዊ ለመጠቀም PIN ጠይቅ"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ስልክ ለመጠቀም PIN ጠይቅ"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ጡባዊ ለመጠቀም PIN ጠይቅ"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"ስልክ ለመጠቀም PIN ጠይቅ"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"SIM PIN ለውጥ"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ጡባዊ ለመጠቀም ፒን  ጠይቅ"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ስልክ ለመጠቀም ፒን  ጠይቅ"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ጡባዊ ለመጠቀም ፒን  ጠይቅ"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"ስልክ ለመጠቀም ፒን  ጠይቅ"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"SIM ፒን  ለውጥ"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM ፒን"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM ካርድ ሸንጉር"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM ካርድ ክፈት"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"የድሮSIM PIN"</string>
-    <string name="sim_enter_new" msgid="8742727032729243562">"አዲስ SIM PIN"</string>
-    <string name="sim_reenter_new" msgid="3178510434642201544">"አዲስ PIN  ድጋሚ ተይብ"</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"የድሮSIM ፒን"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"አዲስ SIM ፒን"</string>
+    <string name="sim_reenter_new" msgid="3178510434642201544">"አዲስ ፒን   ድጋሚ ተይብ"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"SIM ፒን"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"የተሳሳተ ፒን!"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"ፒኖቹ አይዛመዱም"</string>
     <string name="sim_change_failed" msgid="304964924772218382">"ፒን መለወጥ አይቻልም::\n ምናልባት ልክ ያልኾነ ፒን ሊሆን ይችላል::"</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN በተሳካ ተለውጧል"</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM ፒን  በተሳካ ተለውጧል"</string>
     <string name="sim_lock_failed" msgid="5651596916127873626">"የሲም ካርድን ቆልፍ ሁኔታ ለመለወጥ አይቻልም። \n የተሳሳተ ፒን ሊሆን ይችላል።"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"እሺ"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ሰርዝ"</string>
@@ -1048,24 +1048,24 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"በማስገባት ላይ..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"የይለፍ ቃለዎን ይምረጡ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"የእርስዎን ስርዓተ ጥለት ይምረጡ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PINዎን ይምረጡ"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"የእርስዎን ፒን ይምረጡ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"የይለፍ ቃልዎን ያረጋግጡ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ስርዓተ ጥለትዎን ያረጋግጡ"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PINዎንያረጋግጡ"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"የእርስዎን ፒን ያረጋግጡ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"የይለፍ ቃላት አይዛመዱም"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PINኦች አይዛመዱም"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ምርጫዎችን ክፈት"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"የይለፍ ቃል ተዘጋጅቷል"</string>
-    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN አልተዘጋጀም ነበር"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"ፒን  አልተዘጋጀም ነበር"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"ስርዓተ ጥለት ተዘጋጅቷል"</string>
     <string name="lock_settings_title" msgid="335025124489630932">"ማሳያ ደህንነት"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"መክፈቻ ስርዓት ጥለት ለውጥ"</string>
-    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"መክፈቻ PIN ለውጥ"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"መክፈቻ ፒን  ለውጥ"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"የተቀመጠ ስርዓተ ጥለት አረጋግጥ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"በድጋሚ ሞክር::"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"የመክፈቻ ስርዓተ ንጥል ሳል"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"ለእገዛ ምናሌ ተጫን"</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ሲጨርሱ ጣትዎን ያንሱት"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ሲከናወን ጣትዎን ያንሱት"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"ቢያንስ <xliff:g id="NUMBER">%d</xliff:g> ነጥቦችን ያያይዙ። እንገደና ይሞክሩ።"</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"ሥርዓተ ጥለት ተመዝግቧል"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"ለማረጋገጥ ሥርዓተ ጥለት ድጋሚ ሳል"</string>
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"የእርስዎ ጡባዊ እና የግል ውሂብ ካልታወቁ ምንጮች በሚመጡ መተግበሪያዎች ለጥቃት የተጋለጡ ናቸው። እነዚህን መተግበሪያዎች በመጠቀምዎ ሊከሰት በሚችለው የጡባዊዎ ጉዳት ወይም የውሂብ መጥፋት ሙሉ በሙሉ ሃላፊነቱን እርስዎ ብቻ ለመውሰድ ተስማምተዋል።"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"የእርስዎ ስልክ እና የግል ውሂብ ከአልታወቁ ምንጭ መተግበሪያዎች ለሚደርሱ ጥቃቶች የተጋለጡ ናቸው። እነዚህን መተግበሪያዎች መጠቀም በመቀጠልዎ ለሚደርስ ማናቸውም ጉዳት ሆነ የውሂብ መጥፋት ሃላፊነቱን ሙሉ በሙሉ ለብቻዎ እንደሚወስዱ ተስማማተዋል።"</string>
     <string name="verify_applications" msgid="2959359554974828518">"መተግበሪያዎችን ያረጋግጡ"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"ሊጎዱ የሚችሉ መተግበሪያዎችን ከልክል ወይም ከመጫናቸው በፊት አስጠንቅቅ"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"ሁሉንም መተግበሪያዎች በመደበኝነት ይፈትሹ እና አደጋ ሊያስከትሉ የሚችሉትን አይፍቀዱ ወይም ስለእነሱ ማስጠንቀቂያ ይስጡ"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"የላቁ ቅንብሮች"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"ተጨማሪ የቅንብሮች አማራጮች ያንቁ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"የመተግበሪያ መረጃ"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"የድምፅ ጥሪዎች"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ስራ ፈትጡባዊ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ስልክ ሥራ የፈታበት"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"ያልተቆጠረ"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"ከመጠን በላይ የተቆጠረ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ጠቅላላ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ቅድመ ገፅ"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"የባትሪ ኃይል ቁጠባ ሁነታን ይምረጡ"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"መተግበሪያው የባትሪ ፍጆታን ለመቀነስ ቅንብሮችን ሊያቀርብ ይችላል"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"በተጠቃሚው ስራ ላይ የዋለው ባትሪ"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"ያልተቆጠረ የሃይል አጠቃቀም"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ከመጠን በላይ የተቆጠረ የሃይል አጠቃቀም"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g>ከተነቀለ ጀምሮ"</string>
@@ -1773,7 +1775,7 @@
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"ሥምሪያ ሰርዝ"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g> አሁን ለማስመር ንካ"</string>
-    <string name="sync_gmail" msgid="714886122098006477">"ጂሜይል"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"የቀን መቁጠሪያ"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"እውቅያዎች"</string>
     <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">" ወደ Google አመሳስል እንኳን ደህና መጡ!"</font>\n" ውሂብ ለማመሳሰል የእርስዎን ዕውቂያዎች፣ ቀጠሮዎች እና ሌሎችም ካሉበት ለመድረስ እንዲሁም ለመፍቀድ የGoogle አቀራረብ።"</string>
@@ -2079,7 +2081,7 @@
     <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
     <string name="pairing_button_title" msgid="7411638037556429744">"አሁን አጣምር"</string>
     <string name="status_no_ring_detected" msgid="838954925249421062">"መለያውን ጠረጴዛው ላይ ያስተኙት እና ስልኩን ከላይ ያስቀምጡት"</string>
-    <string name="status_device_paired" msgid="4916932520416516526">"መለያ እና ስልክ በተሳካ ሁኔታ ተጣምረዋል፣ በቃ ጨርሰዋል!"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"መለያ እና ስልክ በተሳካ ሁኔታ ተጣምረዋል፣ በቃ ተከናውኗል!"</string>
     <string name="status_error_invalid_device" msgid="5045003971535647259">"የቀረበው መለያ ስልክዎን ለማስከፈት ስራ ላይ መዋል አይችልም"</string>
     <string name="status_error_pairing_failed" msgid="8260473909085202868">"ከእርስዎ መለያ ጋር የሚደረገው ማጣመር አልተሳካም፣ እባክዎ እንደገና ይሞክሩ"</string>
     <string name="enable_nfc" msgid="5234514241098808766">"NFC አልነቃም፣ እና በNFC ለመክፈት ያስፈልጋል። እባክዎ NFCን ያብሩ።"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"የአሰሳ መሣቢያውን ክፈት"</string>
     <string name="drawer_close" msgid="3329237203619660131">"የአሰሳ መሣቢያውን ዝጋ"</string>
     <string name="dashboard_title" msgid="821911564947991553">"አጠቃላይ ዕይታ"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"ማሳወቂያዎችን አሳይ"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"ልዩ ጥንቃቄ የሚፈልጉ የማሳወቂያ ይዘቶች ሲቆለፍ ይደበቃሉ"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"ሁሉም የማሳወቂያ ይዘቶች ሲቆለፉ ይታያሉ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9a404af..8c064ce 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"تكون بيانات جهازك اللوحي وبياناتك الشخصية أكثر عرضة للهجوم من خلال التطبيقات مجهولة المصادر. أنت توافق على أنك المسؤول الوحيد عن أي ضرر لجهازك اللوحي أو أي فقدان للبيانات ينتج عن استخدام هذه التطبيقات."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"تكون بيانات هاتفك وبياناتك الشخصية أكثر عرضة للهجوم من خلال التطبيقات مجهولة المصادر. أنت توافق على أنك المسؤول الوحيد عن أي ضرر لهاتفك أو أي فقدان للبيانات ينتج عن استخدام هذه التطبيقات."</string>
     <string name="verify_applications" msgid="2959359554974828518">"التحقق من التطبيقات"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"عدم السماح أو التحذير قبل تثبيت التطبيقات التي قد تؤدي إلى حدوث ضرر"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"فحص كل التطبيقات بشكل منتظم وعدم السماح بتلك التي قد تسبب ضررًا أو التحذير بشأنها"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"الإعدادات المتقدمة"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"تمكين المزيد من خيارات الإعدادات."</string>
     <string name="application_info_label" msgid="5736524913065714880">"عن التطبيق"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"المكالمات الصوتية"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"الجهاز اللوحي خامل"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"الهاتف خامل"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"غير مقدّر"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"استخدام زائد عن الحد"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"‏إجمالي استخدام CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU في المقدمة"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"تحديد وضع توفير البطارية"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"قد يعرض التطبيق إعدادات لتقليل استخدام البطارية"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"البطارية التي يستهلكها المستخدم"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"استخدام غير مقدّر للطاقة"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"استخدام زائد عن الحد للطاقة"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> مللي أمبير في الساعة"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> منذ عدم التوصيل"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"فتح ساحب التنقل"</string>
     <string name="drawer_close" msgid="3329237203619660131">"إغلاق ساحب التنقل"</string>
     <string name="dashboard_title" msgid="821911564947991553">"نظرة عامة"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"إظهار الإشعارات"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"سيتم إخفاء محتويات الإشعارات المهمة عند قفل الشاشة"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"سيتم عرض كل محتويات الإشعارات عند قفل الشاشة"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 22fe727..b5ded59 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Таблетът и личните ви данни са по-уязвими на атака от приложения от неизвестни източници. Приемате, че носите цялата отговорност в случай на повреда на таблета или при загуба на данни вследствие използването на такива приложения."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Данните на телефона ви и личната ви информация са по-уязвими на атака от приложения от неизвестни източници. Приемате, че носите цялата отговорност в случай на повреда на телефона или при загуба на данни вследствие използването на такива приложения."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Приложенията да се потвърдят"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Забраняване или предупреждаване преди инсталирането на приложения, които може да причинят вреди"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Всички приложения да се проверяват редовно и да не се разрешават или да се предупреждава за тези, които може да навредят"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Разширени настройки"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Да се активират още опции за настройки"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Информация за приложението"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Гласови обаждания"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Таблетът е неактивен"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Телефонът не се използва"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Неотчетено"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Отчетено в повече"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Процесор, общо"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор, на преден план"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Избиране на режим за запазване на батерията"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Приложението може да предлага настройки за намаляване на употребата на батерията"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Батерия, използвана от потребителя"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Неотчетено захранване"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Отчетено в повече захранване"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАч"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> след изключването"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Отваряне на слоя за навигация"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Затваряне на слоя за навигация"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Общ преглед"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Известия"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Поверит. съдържание ще е скрито при заключен екран"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Цялото съдържание ще се показва при заключен екран"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4f5688c..6abaf9b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"La tauleta i les dades personals són més vulnerables a l\'atac d\'aplicacions provinents de fonts desconegudes. Acceptes que ets l\'únic responsable de qualsevol dany que es produeixi a la teva tauleta o de la pèrdua de dades que pugui ocasionar la utilització d\'aquestes aplicacions."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"El telèfon i les dades personals són més vulnerables a atacs per part d\'aplicacions d\'orígens desconeguts. L\'usuari accepta ser l\'únic responsable de qualsevol dany que es produeixi al telèfon o de la pèrdua de dades que puguin resultar de l\'ús d\'aquestes aplicacions."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verifica les aplicacions"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"No permetis la instal·lació d\'aplicacions que puguin causar danys o bé mostra una advertència abans de fer-ho"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Comprova les aplicacions regularment, i informa sobre les que puguin causar danys o desactiva-les"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configuració avançada"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activa més opcions de configuració"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informació de l\'aplicació"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Trucades de veu"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tauleta inactiva"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telèfon inactiu"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Sense comptabilitzar"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Comptabilitzada més d\'una vegada"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer pla de la CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecciona el mode d\'estalvi de bateria"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'aplicació pot oferir paràmetres per reduir l\'ús de la bateria"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateria utilitzada per l\'usuari"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consum d\'energia sense comptabilitzar"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consum d\'energia comptabilitzat més d\'una vegada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> des de la desconnexió"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Obre el tauler de navegació"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Tanca el tauler de navegació"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Descripció"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Mostra notific."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Les notificac. confidencials s\'amagaran quan es bloquegin."</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Les notificacions es mostraran quan es bloquegin."</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1b9670b..c73d8de 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Data zařízení a osobní údaje jsou zranitelnější vůči útoku aplikací, které pochází z neznámých zdrojů. Souhlasíte s tím, že jste výhradně odpovědní za případné škody na zařízení a ztráty dat způsobené používáním těchto aplikací."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Váš telefon a osobní údaje jsou zranitelnější vůči útoku aplikací, které pochází z neznámých zdrojů. Souhlasíte s tím, že nesete osobní odpovědnost za jakékoli škody způsobené na vašem telefonu nebo za ztrátu dat v důsledku používání těchto aplikací."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Ověřovat aplikace"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Zakázat instalaci škodlivých aplikací nebo na ně upozornit"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Pravidelně všechny aplikace kontrolovat a ty, které mohou být škodlivé, zakázat nebo na ně upozornit"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Upřesnit nastavení"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Povolit další možnosti nastavení"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informace o aplikaci"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet v nečinnosti"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"V nečinnosti"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neobjasněno"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Nadhodnoceno"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Doba provozu procesoru"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popředí"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Vyberte režim úspory baterie"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"V aplikaci mohou být k dispozici nastavení ke snížení spotřeby"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterie spotřebovaná uživatelem"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neobjasněná spotřeba energie"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadhodnocení spotřeby energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojení"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Otevřít navigační panel"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Zavřít navigační panel"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Přehled"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Zobr. oznámení"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Při uzamčení bude citlivý obsah oznámení skryt."</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Při uzamčení bude zobrazen veškerý obsah oznámení."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 26b89cb..51061d1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Dine tabletdata og personlige data er mere sårbare over for angreb fra apps fra ukendte kilder. Du accepterer, at du alene er ansvarlig for eventuelle skader på din tablet eller tab af data, der kan skyldes brug af disse apps."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Din telefon og dine personlige data er mere sårbare over for angreb fra apps fra ukendte kilder. Du accepterer, at du alene er ansvarlig for eventuelle skader på din telefon eller tab af data, der kan skyldes brugen af disse apps."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Bekræft apps"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Forbyd eller advar mod potentielt skadelige apps inden installationen"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Kontrollér regelmæssigt alle apps, og forbyd eller advar om dem, der kan forårsage skade"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avancerede indstillinger"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktivér flere indstillinger"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Oplysninger om appen"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Stemmeopkald"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tabletcomputeren er ikke aktiv"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen er ikke aktiv"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Ikke medregnet"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Overvurderet"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU i alt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU forgrund"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Vælg batteribesparende tilstand"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Denne app har muligvis indstillinger, der kan reducere batteriforbruget"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Brugerens batteriforbrug"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Ikke medregnet strømforbrug"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overvurderet strømforbrug"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden afbrydelse"</string>
@@ -2041,8 +2043,8 @@
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Få flere oplysninger"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Find apps"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Vil du angive dette som din præference?"</string>
-    <string name="nfc_payment_set_default" msgid="8961120988148253016">"Vil du altid bruge <xliff:g id="APP">%1$s</xliff:g>, når du bruger Peg og betal?"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="3803693771001226795">"Vil du altid bruge <xliff:g id="APP_0">%1$s</xliff:g> i stedet for <xliff:g id="APP_1">%2$s</xliff:g>, når du bruger Peg og betal?"</string>
+    <string name="nfc_payment_set_default" msgid="8961120988148253016">"Vil du altid bruge <xliff:g id="APP">%1$s</xliff:g>, når du bruger Tryk og betal?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="3803693771001226795">"Vil du altid bruge <xliff:g id="APP_0">%1$s</xliff:g> i stedet for <xliff:g id="APP_1">%2$s</xliff:g>, når du bruger Tryk og betal?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Begrænsninger"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Fjern begrænsninger"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Skift pinkode"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Åbn navigationsskuffen"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Luk navigationsskuffen"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Oversigt"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Underretninger"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Følsomt indhold i underretningen skjules, når låst"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Alt indhold i underretningen vises, når låst"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8ba65fc..50f76c2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1097,7 +1097,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Apps mit unbekannter Herkunft können gefährlich für Ihr Tablet und Ihre personenbezogenen Daten sein. Sie stimmen zu, dass Sie die Verantwortung für alle Schäden an Ihrem Tablet und jegliche Datenverluste tragen, die aus der Verwendung dieser Apps entstehen können."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Apps mit unbekannter Herkunft können gefährlich für Ihr Telefon und Ihre personenbezogenen Daten sein. Sie stimmen zu, dass Sie die Verantwortung für alle Schäden an Ihrem Telefon und jegliche Datenverluste tragen, die aus der Verwendung dieser Apps entstehen können."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Apps verifizieren"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Installation schädlicher Apps blockieren oder Warnung senden"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Überprüfen Sie regelmäßig alle Apps und markieren Sie potenziell schädliche Apps als unzulässig oder warnen Sie vor diesen."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Erweiterte Einstellungen"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Weitere Einstellungsoptionen aktivieren"</string>
     <string name="application_info_label" msgid="5736524913065714880">"App-Info"</string>
@@ -1512,7 +1512,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Anrufe"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Ruhezustand"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Ruhezustand"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Nicht nachvollziehbar"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Zu hoch berechnet"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU insgesamt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU Vordergrund"</string>
@@ -1556,7 +1557,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Energiesparmodus auswählen"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Die App bietet unter Umständen Einstellungen für einen geringeren Akkuverbrauch."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Akkuverbrauch durch Nutzer"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Nicht nachvollziehbarer Stromverbrauch"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zu hoch berechneter Stromverbrauch"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> seit dem Ausstecken"</string>
@@ -2088,4 +2090,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Navigationsleiste öffnen"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Navigationsleiste schließen"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Übersicht"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Benachr. zeigen"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Vertrauliche Inhalte bei Sperre ausgeblendet"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Alle Inhalte auf Sperrbildschirm sichtbar"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 9d4be24..09a097c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Η συσκευή σας tablet και τα προσωπικά σας δεδομένα είναι περισσότερο ευάλωτα σε επιθέσεις από εφαρμογές από άγνωστες προελεύσεις. Συμφωνείτε ότι είστε αποκλειστικά υπεύθυνοι για τυχόν βλάβη η οποία ενδέχεται να δημιουργηθεί στο tablet σας ή τυχόν απώλεια δεδομένων η οποία ενδέχεται να προκύψει μέσα από τη χρήση αυτών των εφαρμογών."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Το τηλέφωνό σας και τα προσωπικά δεδομένα σας είναι ευάλωτα σε επιθέσεις από εφαρμογές που προέρχονται από άγνωστες πηγές. Συμφωνείτε ότι είστε οι μοναδικοί υπεύθυνοι για κάθε ζημιά στο τηλέφωνο ή για απώλεια δεδομένων που ενδέχεται να προκύψουν από τη χρήση τέτοιων εφαρμογών."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Επαλήθευση εφαρμογών"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Να μην επιτρέπεται ή να γίνεται προειδοποίηση πριν από την εγκατάσταση εφαρμογών που μπορεί να είναι επικίνδυνες"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Τακτικός έλεγχος όλων των εφαρμογών και κατάργηση ή προειδοποίηση για εκείνες που ενδέχεται να προκαλέσουν προβλήματα"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Σύνθετες ρυθμίσεις"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Ενεργοποίηση περισσότερων επιλογών ρυθμίσεων"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Πληροφορίες εφαρμογής"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Φωνητικές κλήσεις"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Αδράνεια tablet"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Το τηλέφωνο είναι αδρανές"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Χωρίς εκτίμηση"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Υπερεκτίμηση"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Συνολικός χρόνος CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Προσκήνιο CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Επιλέξτε κατάσταση εξοικονόμησης μπαταρίας"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Η εφαρμογή ενδέχεται να προσφέρει ρυθμίσεις που θα μειώσουν τη χρήση της μπαταρίας"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Μπαταρία που χρησιμοποιείται από το χρήστη"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Χωρίς εκτίμηση χρήσης ισχύος"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Υπερεκτίμηση χρήσης ισχύος"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> από την αποσύνδεση"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Άνοιγμα συρταριού πλοήγησης"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Κλείσιμο συρταριού πλοήγησης"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Επισκόπηση"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Εμφ.ειδοποιήσεων"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Απόκρυψη ευαίσθητου περιεχ.ειδοπ. κατά το κλείδωμα"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Εμφάνιση όλου του περιεχ.ειδοπ. κατά το κλείδωμα"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d498711..37ed4a2 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Your tablet and personal data are more vulnerable to attack by apps from unknown sources. You agree that you are solely responsible for any damage to your tablet or loss of data that may result from using these apps."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Your phone and personal data are more vulnerable to attack by apps from unknown sources. You agree that you are solely responsible for any damage to your phone or loss of data that may result from using these apps."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verify apps"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Disallow or warn before installation of apps that may cause harm"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Regularly check all apps and disallow or warn about those that may cause harm"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Enable more settings options"</string>
     <string name="application_info_label" msgid="5736524913065714880">"App info"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Voice calls"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet idle"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Unaccounted"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Select battery-saving mode"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"The application may offer settings to reduce battery use"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Battery used by user"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Unaccounted power use"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Open navigation drawer"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Close navigation drawer"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Overview"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Show notifications"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Sensitive notification contents will be hidden when locked"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"All notification contents will be shown when locked"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index d498711..37ed4a2 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Your tablet and personal data are more vulnerable to attack by apps from unknown sources. You agree that you are solely responsible for any damage to your tablet or loss of data that may result from using these apps."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Your phone and personal data are more vulnerable to attack by apps from unknown sources. You agree that you are solely responsible for any damage to your phone or loss of data that may result from using these apps."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verify apps"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Disallow or warn before installation of apps that may cause harm"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Regularly check all apps and disallow or warn about those that may cause harm"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Enable more settings options"</string>
     <string name="application_info_label" msgid="5736524913065714880">"App info"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Voice calls"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet idle"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Unaccounted"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Select battery-saving mode"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"The application may offer settings to reduce battery use"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Battery used by user"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Unaccounted power use"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Open navigation drawer"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Close navigation drawer"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Overview"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Show notifications"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Sensitive notification contents will be hidden when locked"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"All notification contents will be shown when locked"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f2ff286..a25e9e4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tu tablet y datos personales son más vulnerables a los ataques de aplicaciones de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño a tu tablet o pérdida de datos que puedan producirse por el uso de estas aplicaciones."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Tu dispositivo y datos personales son más vulnerables a los ataques de aplicaciones de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño a tu dispositivo o pérdida de datos que pueda producirse por el uso de estas aplicaciones."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verificar aplicaciones"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"No permitir o advertir antes de instalar aplicaciones que puedan ocasionar daños"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Comprueba las aplicaciones con regularidad e inhabilita las que puedan dañar el dispositivo o advierte sobre ellas."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configuración avanzada"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activar más opciones de configuración"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Información de la aplicación"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ausente"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"No calculada"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Sobrecalculada"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecciona el modo de ahorro de batería."</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"La aplicación podrá ofrecer una configuración para reducir el uso de la batería."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batería utilizada por el usuario"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Uso de potencia no calculada"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desconectó"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Abrir panel lateral de navegación"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Cerrar panel lateral de navegación"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Descripción"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Notificaciones"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Notificaciones personales ocultas al bloquear"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Notificaciones visibles al bloquear"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index fcaa1d9..efddf25 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"El tablet y los datos personales son más vulnerables a los ataques de aplicaciones de origen desconocido. El usuario acepta ser el único responsable de cualquier daño en el tablet o pérdida de datos que se pueda derivar del uso de estas aplicaciones."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"El teléfono y los datos personales son más vulnerables a los ataques de aplicaciones de origen desconocido. El usuario acepta ser el único responsable de cualquier daño en el teléfono o pérdida de datos que se pueda derivar del uso de estas aplicaciones."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verificar aplicaciones"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"No permitir la instalación de aplicaciones que puedan provocar daños o mostrar una advertencia antes de instalarlas"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Comprueba todas las aplicaciones de forma regular e inhabilita las que pueden dañar el dispositivo o advierte sobre ellas"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ajustes avanzados"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Habilitar más opciones de configuración"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Información de la aplicación"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactivo"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Desconocida"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Sobrecalculada"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecciona el modo de ahorro de batería"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Es posible que la aplicación incluya opciones que permitan reducir el uso de la batería."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batería usada por el usuario"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Uso de potencia desconocido"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desenchufó"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Abrir panel de navegación"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Cerrar panel de navegación"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Descripción"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Mostrar notificaciones"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Notificaciones personales ocultas al bloquear"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Las notificaciones se mostrarán al bloquear"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 3452b32..8d882fa 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Teie tahvelarvuti ja isikuandmed on haavatavamad rünnakutele rakenduste kaudu, mis pärinevad tundmatutest allikatest. Nõustute, et olete ainuisikuliselt vastutav tahvelarvuti kahjustuste või andmekao eest, mis võivad tuleneda nende rakenduste kasutamisest."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefon ja isiklikud andmed on rünnakute suhtes haavatavamad tundmatutest allikatest pärit rakenduste kaudu. Nõustute, et olete ainuisikuliselt vastutav telefoni kahjustuste või andmekao eest, mis võivad tuleneda nende rakenduste kasutusest."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Rakenduste kinnitamine"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Keela potentsiaalselt kahjulike rakenduste installimine või hoiata enne installimist"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Kontrolli regulaarselt kõiki rakendusi ja keela rakendused või kuva hoiatus nende kohta, mis võivad olla kahjulikud"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Täpsemad seaded"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Luba rohkem seadete valikuid"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Rakenduse teave"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Tavakõned"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tahvelarvuti on ooterežiimis"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon tegevuseta"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Arvestamata"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Liigselt arvestatud"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kokku"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU esiplaanil"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Valige akut säästev režiim"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Rakendus võib pakkuda akukasutust vähendavaid seadeid"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Kasutaja akukasutus"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Arvestamata energiatarbimine"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Liigselt arvestatud energiatarbimine"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> alates lahutamisest"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Navigeerimissahtli avamine"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Navigeerimissahtli sulgemine"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Ülevaade"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Kuva märguanded"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Märguande tundlik sisu peidetakse, kui seade on lukustatud"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Märguande kogu sisu kuvat., kui seade on lukustatud"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 18bc3f2..5f6a398 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"رایانهٔ لوحی و داده‌های شخصی شما بیشتر در معرض خطر حمله برنامه‌های منابع ناشناس هستند. شما موافقت می‌کنید که در قبال هر گونه آسیب وارده به رایانهٔ لوحی خود یا از دست دادن داده که در نتیجه استفاده از این برنامه‌ها روی دهد تنها خودتان مسئول هستید."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"گوشی و داده‌های شخصی شما بیشتر در معرض خطر حمله برنامه‌های منابع ناشناس هستند. شما موافقت می‌کنید که در قبال هر گونه آسیبی که در نتیجه استفاده از این برنامه‌ها به گوشی شما وارد شود فقط خودتان مسئول هستید."</string>
     <string name="verify_applications" msgid="2959359554974828518">"تأیید برنامه‌ها"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"مجاز ندانستن یا اخطار قبل از نصب برنامه‌ای که ممکن است آسیب برساند"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"همه برنامه‌ها به طور منظم بررسی می‌شوند و درباره آنهایی که ممکن است مضر باشند، هشدار داده می‌شود یا آن برنامه‌ها پذیرفته نمی‌شوند"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"تنظیمات پیشرفته"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"گزینه‌های تنظیمات بیشتری فعال شود"</string>
     <string name="application_info_label" msgid="5736524913065714880">"اطلاعات برنامه"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"تماس‌های صوتی"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"رایانهٔ لوحی آماده به کار"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"حالت بلااستفاده تلفن"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"محاسبه نشده"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"بیش از حد محاسبه شده"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"‏مقدار کل CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏پیش زمینه CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"انتخاب حالت صرفه‌جویی در مصرف باتری"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"این برنامه دارای تنظیماتی است که در میزان مصرف باتری صرفه‌جویی می‌کند"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"باتری استفاده شده توسط کاربر"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"نیروی مصرفی محاسبه نشده"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"نیروی مصرفی بیش از حد محاسبه شده"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> میلی‌آمپرساعت"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> از زمان جدا کردن"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"باز کردن کشوی پیمایش"</string>
     <string name="drawer_close" msgid="3329237203619660131">"بستن کشوی پیمایش"</string>
     <string name="dashboard_title" msgid="821911564947991553">"نمای کلی"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"نمایش اعلان‌ها"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"در حالت قفل محتوای اعلان حساس پنهان خواهد شد"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"در حالت قفل همه محتوای اعلان نمایش داده می‌شود"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ec1ab55..639092a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tablet-laite ja henkilötiedot ovat alttiimpia tuntemattomista lähteistä tulevien sovelluksien kautta tapahtuville hyökkäyksille. Hyväksyt, että olet itse vastuussa mahdollisista tablet-laitteelle aiheutuvista vahingoista tai tietojen menetyksestä, joka voi johtua näiden sovelluksien käytöstä."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Puhelimesi ja henkilötiedot ovat alttiimpia tuntemattomista lähteistä tulevien sovelluksien kautta tapahtuville hyökkäyksille. Hyväksyt, että olet itse vastuussa mahdollisista puhelimelle aiheutuvista vahingoista tai tietojen menetyksestä, joka voi johtua näiden sovelluksien käytöstä."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Vahvista sovellukset"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Estä mahdollisesti haitallisten sovellusten asennus tai näytä varoitus ennen asennusta"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Tarkista säännöllisesti kaikki sovellukset ja estä ne, jotka saattavat aiheuttaa vahinkoa, tai varoita niistä"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Lisäasetukset"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Ota lisää asetuksia käyttöön."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Sovelluksen tiedot"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Äänipuhelut"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet pois käytöstä"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Puhelin on käyttämätön"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Tuntematon"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Yliarvioitu"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Suorittimen käyttöaika yhteensä"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Suorittimen käyttö etualalla"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Valitse virransäästötila"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Sovellus saattaa tarjota käyttöön asetuksia, joiden avulla akun käyttöä voidaan vähentää."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Käyttäjien käyttämä akun virta"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Tuntematon virrankulutus"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Yliarvioitu virrankulutus"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> laturin irrottamisen jälkeen"</string>
@@ -2087,4 +2089,10 @@
     <string name="drawer_open" msgid="132008699936863299">"Avaa navigointipalkki"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Sulje navigointipalkki"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Yleiskatsaus"</string>
+    <!-- no translation found for lock_screen_notifications (736030096980572317) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (3873689304488434778) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7770997162767814840) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 8f82e9c..c8373e0 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Votre tablette et vos données personnelles sont plus vulnérables face aux attaques d\'applications provenant de sources inconnues. Vous reconnaissez être seul responsable de tout dommage subi par votre tablette ou de toute perte de données pouvant découler de l\'utilisation de ces applications."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Votre téléphone et vos données personnelles sont plus vulnérables face aux attaques d\'applications provenant de sources inconnues. Vous reconnaissez être seul responsable de tout dommage subi par votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de ces applications."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Vérifier les applications"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Ne pas autoriser l\'installation d\'applications potentiellement dangereuses ou afficher un avertissement"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Vérifier régulièrement toutes les applications et désactiver celles qui peuvent causer des dommages, ou alerter l\'utilisateur"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Paramètres avancés"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activer d\'autres paramètres"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informations sur l\'application"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Appels vocaux"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablette inactive"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Téléphone inactif"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Non prise en compte"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Surestimée"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Durée d\'utilisation totale de l\'UC"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"UC - Premier plan"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Sélectionnez le mode Économie de la pile"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'application dispose peut-être de paramètres permettant de réduire l\'utilisation de la batterie."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batterie utilisée par l\'utilisateur"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Utilisation non prise en compte de la pile"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilisation surestimée de la pile"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2089,4 +2091,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Ouvrir le panneau de navigation"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Fermer le panneau de navigation"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Présentation"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Afficher les notifications"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Contenu notif. sensible masqué si écran verrouillé"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Tout contenu notif. s\'affiche si écran verrouillé"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1339363..7ccca02 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Votre tablette et vos données personnelles sont plus vulnérables face aux attaques d\'applications provenant de sources inconnues. Vous reconnaissez être seul responsable de tout dommage subi par votre tablette ou de toute perte de données pouvant découler de l\'utilisation de ces applications."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Votre téléphone et vos données personnelles sont plus vulnérables face aux attaques d\'applications provenant de sources inconnues. Vous reconnaissez être seul responsable de tout dommage subi par votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de ces applications."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Vérifier les applications"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Ne pas autoriser l\'installation d\'applications potentiellement dangereuses ou afficher un avertissement"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Vérifier régulièrement toutes les applications, et annuler l\'autorisation de celles qui peuvent être nuisibles, ou alerter l\'utilisateur"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Paramètres avancés"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activer d\'autres paramètres"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informations sur l\'application"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Appels vocaux"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablette inactive"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Téléphone inactif"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Non prise en compte"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Surestimée"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"UC - Durée totale"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"UC - Premier plan"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Sélectionnez le mode Économie de batterie."</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'application dispose peut-être de paramètres permettant de réduire l\'utilisation de la batterie."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batterie utilisée par l\'utilisateur"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consommation non prise en compte"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consommation surestimée"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2089,4 +2091,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Ouvrir le panneau de navigation"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Fermer le panneau de navigation"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Vue d\'ensemble"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Afficher notif."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Contenu notif. sensible masqué si écran verrouillé"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Tout contenu notif. s\'affiche si écran verrouillé"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5a79730..956d85a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"आपका टेबलेट एवं निजी डेटा अज्ञात स्रोतों के ऐप्स के आक्रमण के प्रति अधिक भेद्य हैं. आप इस बात से सहमत हैं कि आप इन ऐप्स के उपयोग परिणामस्वरूप आपके टेबलेट को होने वाली क्षति या डेटा की हानि के लिए पूर्ण रूप से ज़िम्मेदार हैं."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"आपका फ़ोन एवं निजी डेटा अज्ञात स्रोतों के ऐप्स के आक्रमण के प्रति अधिक भेद्य हैं. आप इस बात से सहमत हैं कि आप इन ऐप्स के उपयोग परिणामस्वरूप आपके फ़ोन को होने वाली क्षति या डेटा की हानि के लिए पूर्ण रूप से ज़िम्मेदार हैं."</string>
     <string name="verify_applications" msgid="2959359554974828518">"ऐप्स  सत्यापित करें"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"हानि पहुंचा सकने वाले ऐप्स  का इंस्टॉलेशन अस्वीकार करें या पहले चेतावनी दें"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"सभी ऐप्स को नियमित रूप से जांचें और जो हानि पहुंचा सकते हैं उन्हें अनुमति न दें या उनके लिए चेतावनी दें"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"अतिरिक्त सेटिंग"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"अधिक सेटिंग विकल्‍प सक्षम करें"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ऐप्स जानकारी"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"ध्‍वनि कॉल"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"टेबलेट निष्‍क्रिय"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"फ़ोन निष्‍क्रिय"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"बेहिसाब"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"अत्यधिक"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"कुल CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रभाग"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"बैटरी की बचत मोड चुनें"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"बैटरी के उपयोग में कमी लाने के लिए ऐप्स, सेटिंग ऑफ़र कर सकता है"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"उपयोगकर्ता के द्वारा उपयोग की गई बैटरी"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"पावर का बेहिसाब उपयोग"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"पावर का अत्यधिक उपयोग"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"अनप्लग करने के बाद से <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"नेविगेशन ड्रॉवर खोलें"</string>
     <string name="drawer_close" msgid="3329237203619660131">"नेविगेशन ड्रॉवर बंद करें"</string>
     <string name="dashboard_title" msgid="821911564947991553">"ओवरव्यू"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"सूचना दिखाएं"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"लॉक होने पर संवेदनशील सूचना सामग्री छिप जाएंगी"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"लॉक होने पर सभी सूचना सामग्री दिखाई देंगी"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index a48356f..79de454 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Vaše tabletno računalo i osobni podaci izloženiji su napadima aplikacija iz nepoznatih izvora. Prihvaćate isključivu odgovornost za svu štetu nastalu na tabletnom računalu ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Vaš telefon i osobni podaci izloženiji su napadima aplikacija iz nepoznatih izvora. Prihvaćate isključivu odgovornost za svu štetu nastalu na telefonu ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Potvrdi aplikacije"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Onemogući ili upozori prije instalacije aplikacija koje mogu uzrokovati štetu"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Redovito provjeravaj sve aplikacije i onemogući ili upozori na one koje mogu prouzročiti štetu"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Omogućiti više opcija postavki"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informacije o aplikaciji"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Glasovni pozivi"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tabletni uređaj u mirovanju"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u mirovanju"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neobračunato"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Previše obračunato"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Ukupno CPU-a"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Glavni zadatak CPU-a"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Odaberite način štednje baterije"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikacija možda nudi postavke za smanjenje potrošnje baterije"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterija koju upotrebljava korisnik"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neobračunata potrošnja energije"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Previše obračunata potrošnja energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od isključivanja"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Otvaranje ladice za navigaciju"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Zatvaranje ladice za navigaciju"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Pregled"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Pokaži obavijest"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Na zaključanom zaslonu nema osjetljivih obavijesti"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Zaključani zaslon prikazuje sve obavijesti"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index daf0281..2be05b0 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"A táblagépre és a személyes adatokra sokkal nagyobb veszélyt jelentenek az ismeretlen forrásból származó alkalmazások támadásai. Ön kijelenti, hogy egyedül Ön felel a táblagépen bekövetkező minden olyan kárért vagy adatvesztésért, amely ezen alkalmazások használatából fakad."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"A telefonra és a személyes adatokra sokkal nagyobb veszélyt jelentenek az ismeretlen forrásból származó alkalmazások támadásai. Ön kijelenti, hogy egyedül Ön felel a telefonon bekövetkező minden olyan kárért vagy adatvesztésért, amely ezen alkalmazások használatából fakad."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Alkalmazások ellenőrzése"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Tiltás vagy figyelmeztetés az olyan alkalmazások telepítése előtt, amelyek károsak lehetnek"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Az alkalmazások rendszeres ellenőrzése, és értesítés a kártékony alkalmazásokról, illetve azok letiltása"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Speciális beállítások"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"További beállítási lehetőségek engedélyezése"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Alkalmazásinformáció"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Hanghívások"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Táblagép - tétlen"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon - tétlen"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Elszámolatlan"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Túlbecsült"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU teljes"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-használat az előtérben"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Energiatakarékos mód kiválasztása"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Az alkalmazás felkínálhat olyan beállításokat, amelyek csökkentik az energiafelhasználást"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"A felhasználó akkumulátorhasználata"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Elszámolatlan energiafogyasztás"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Túlbecsült energiafogyasztás"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> az utolsó töltés óta"</string>
@@ -2089,4 +2091,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Navigációs fiók kinyitása"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Navigációs fiók bezárása"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Áttekintés"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Értesítések megjelenítése"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Zárolt állapotban a bizalmas értesítések rejtve maradnak."</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Lezárt képernyőnél minden értesítés látszik"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index d78de3d..fa1b0fd 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Ձեր գրասալիկն ու անձնական տվյալները առավել խոցելի են անհայտ աղբյուրների հավելվածների նկատմամբ: Դուք ընդունում եք, որ  ինքներդ ամբողջապես պատասխանատու եք ձեր սարքին պատճառած ցանկացած վնասի կամ տվյալների կորստի համար, ինչը կարող է տեղի ունենալ նման հավելվածներն օգտագործելիս:"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Ձեր հեռախոսը և անձնական տվյալները առավել խոցելի են անհայտ աղբյուրների ծրագրերի նկատմամբ: Դուք ընդունում եք, որ ինքներդ ամբողջապես պատասխանատու եք ձեր հեռախոսին պատճառած ցանկացած վնասի կամ տվյալի կորստի համար, ինչը կարող է տեղի ունենալ նման ծրագրեր օգտագործելիս:"</string>
     <string name="verify_applications" msgid="2959359554974828518">"Ստուգել ծրագրերը"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Թույլ չտալ կամ նախազգուշացնել այն հավելվածները տեղադրելուց առաջ, որոնք կարող են վնաս հասցնել"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Պարբերաբար ստուգել բոլոր ծրագրերը և հնարավոր վնասակար ծրագրերի դեպքում զգուշացնել կամ անջատել դրանք"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ընդլայնված կարգավորումներ"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Միացնել այլ կարգավորման ընտրանքներ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Ծրագրի տեղեկությունները"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Ձայնային զանգեր"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Գրասալիկի անգործունը"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Հեռախոսի անգործունը"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Չհաշվարկված"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Գերօգտագործում"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-ի ընդհանուրը"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU առաջնատեսք"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Ընտրեք մարտկոցը խնայող ռեժիմ"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Հավելվածը կարող է առաջարկել կարգավորումներ` մարտկոցի օգտագործումը նվազեցնելու համար"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Օգտվողի կողմից օգտագործված մարտկոցը"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Մարտկոցի չհաշվարկված օգտագործում"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Մարտկոցի գերօգտագործում"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> հոսանքից անջատելուց հետո"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Բացել նավարկման դարակը"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Փակել նավարկման դարակը"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Համատեսք"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Ցուցադրել ծանուցումները"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Ծանուցման զգայուն բովանդակությունը կթաքցվի կողպված ժամանակ"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Ծանուցման ողջ բովանդակությունը կցուցադրվի կողպված ժամանակ"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 6e8e35f..8c63e1a 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tablet dan data pribadi Anda lebih rentan terhadap serangan apl dari sumber yang tidak dikenal. Anda setuju untuk bertanggung jawab penuh atas segala kerusakan pada tablet atau kehilangan data yang mungkin diakibatkan oleh penggunaan apl ini."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Ponsel dan data pribadi Anda lebih rentan terhadap serangan apl dari sumber yang tidak dikenal. Anda setuju untuk bertanggung jawab penuh atas segala kerusakan pada ponsel atau kehilangan data yang mungkin diakibatkan oleh penggunaan apl ini."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verifikasi aplikasi"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Jangan izinkan atau peringatkan sebelum pemasangan aplikasi yang dapat menyebabkan kerusakan"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Memeriksa semua aplikasi secara berkala dan tidak mengizinkan atau memperingatkan tentang aplikasi yang berbahaya"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setelan lanjutan"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktifkan opsi setelan yang lain"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Info apl"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Panggilan suara"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet menganggur"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telepon menganggur"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Tidak terhitung"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Dihitung berlebih"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pilih mode hemat baterai"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Apl tersebut mungkin menawarkan setelan untuk mengurangi penggunaan baterai"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterai yang digunakan oleh pengguna"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Penggunaan daya yang tidak terhitung"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan daya yang dihitung berlebih"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak dicabut"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Buka panel samping navigasi"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Tutup panel samping navigasi"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Ikhtisar"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Lihat Notifikasi"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Isi notifikasi sensitif tersembunyi saat terkunci"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Semua isi notifikasi ditampilkan saat terkunci"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d07bf7a..6116d6b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Il tablet e i dati personali sono più vulnerabili agli attacchi da parte di applicazioni di origini sconosciute. L\'utente accetta di essere il solo responsabile degli eventuali danni al tablet o della perdita di dati che potrebbero derivare dall\'utilizzo di queste applicazioni."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Il telefono e i dati personali sono più vulnerabili agli attacchi da parte di applicazioni di origini sconosciute. L\'utente accetta di essere il solo responsabile degli eventuali danni al telefono o della perdita di dati che potrebbero derivare dall\'utilizzo di queste applicazioni."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verifica app"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Non consentire o avvisa prima dell\'installazione di applicazioni che potrebbero causare danni"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Controlla regolarmente tutte le app e non consentire o segnala quelle che potrebbero essere dannose"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Impostazioni avanzate"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Attiva altre impostazioni"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informazioni applicazione"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Chiamate vocali"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inattivo"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefono inattivo"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Non considerato"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Sovrastimato"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Totale CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU in primo piano"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Seleziona modalità a basso consumo"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'applicazione potrebbe offrire impostazioni per ridurre l\'utilizzo della batteria"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batteria utilizzata dall\'utente"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consumo batteria non considerato"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo batteria sovrastimato"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> dallo scollegamento"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Apri riquadro a scomparsa di navigazione"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Chiudi riquadro a scomparsa di navigazione"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Panoramica"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Mostra notifiche"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Contenuti riservati nascosti con blocco attivo"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Visualizzazione di tutti i contenuti con blocco"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 170f834..8b2e39f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"הטאבלט והנתונים האישיים שלך חשופים יותר בפני התקפות על ידי אפליקציות ממקורות לא ידועים. אתה מסכים לכך שאתה האחראי הבלעדי לכל נזק שייגרם לטאבלט שלך או לאובדן נתונים שעלולים להיגרם בעקבות שימוש באפליקציות אלה."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"הטלפון והנתונים האישיים שלך חשופים יותר בפני התקפות של אפליקציות ממקורות לא ידועים. אתה מסכים לכך שאתה האחראי הבלעדי לכל נזק שנגרם לטלפון או לאובדן של נתונים שעשויים להיגרם כתוצאה משימוש באפליקציות אלה."</string>
     <string name="verify_applications" msgid="2959359554974828518">"אמת אפליקציות"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"מנע או הזהר לפני התקנת אפליקציה שעשויה לגרום נזק"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"בדוק באופן סדיר את כל האפליקציות והשבת או שלח התראה לגבי אפליקציות שעלולות לגרום נזק"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"הגדרות מתקדמות"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"אפשר עוד אפשרויות הגדרה."</string>
     <string name="application_info_label" msgid="5736524913065714880">"פרטי אפליקציה"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"שיחות קוליות"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"טאבלט לא פעיל"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"טלפון לא פעיל"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"לא מוסבר"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"חישוב יתר"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"‏CPU - סך הכל"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU בחזית"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"בחר במצב חיסכון בסוללה"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ייתכן שהאפליקציה מציעה הגדרות לצמצום צריכת הסוללה"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"סוללה בשימוש על ידי משתמש"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"שימוש לא מוסבר בחשמל"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"חישוב יתר של שימוש בחשמל"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> מיליאמפר לשעה"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> מאז הניתוק"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"פתח את חלונית הניווט"</string>
     <string name="drawer_close" msgid="3329237203619660131">"סגור את חלונית הניווט"</string>
     <string name="dashboard_title" msgid="821911564947991553">"סקירה כללית"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"הצג התראות"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"תוכן התראות רגיש יוסתר כשהמכשיר נעול"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"התוכן של כל ההתראות יוצג כשהמכשיר נעול"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 03e710e..358fb50 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1098,7 +1098,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"提供元不明のアプリからタブレットや個人データが攻撃を受ける可能性が高くなります。このようなアプリの使用により生じる可能性があるタブレットへの損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"提供元不明のアプリから携帯端末や個人データが攻撃を受ける可能性が高くなります。このようなアプリの使用により生じる可能性がある携帯端末への損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
     <string name="verify_applications" msgid="2959359554974828518">"アプリを確認する"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"損害をもたらす可能性があるアプリのインストールを禁止またはインストール前に警告する"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"すべてのアプリを定期的に確認し、損害をもたらす可能性のあるアプリを拒否または警告する"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"詳細設定"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"詳細設定オプションを有効にする"</string>
     <string name="application_info_label" msgid="5736524913065714880">"アプリ情報"</string>
@@ -1513,7 +1513,8 @@
     <string name="power_phone" msgid="5392641106474567277">"通話"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"アイドル状態"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"アイドル状態"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"算出不能"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"過剰算出"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU合計"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUフォアグラウンド"</string>
@@ -1557,7 +1558,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"バッテリー節約モードを選択します"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"アプリ側の設定で電池使用量を抑えられる場合があります"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ユーザーの電池使用量"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"算出不能の消費電力"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"過剰算出された消費電力"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"電池使用時間: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2093,4 +2095,7 @@
     <string name="drawer_open" msgid="132008699936863299">"ナビゲーションドロワーを開く"</string>
     <string name="drawer_close" msgid="3329237203619660131">"ナビゲーションドロワーを閉じる"</string>
     <string name="dashboard_title" msgid="821911564947991553">"概要"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"通知を表示"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"ロック時にプライベートな通知の内容を非表示にします"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"ロック時にすべての通知の内容を表示します"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index a0ce491..1bb515f 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"თქვენი ტაბლეტის და პირადი მონაცემები უცნობი წყაროების აპების შემთხვევაში შეტევების მეტი რისკის ქვეშ დგას. თქვენ თანხმობას აცხადებთ მასზედ, რომ სრულიად პასუხისმგებელი ხართ ამ აპების გამოყენების შედეგად თქვენი ტაბლეტისადმი მიყენებულ ზარალზე ან მონაცემების დაკაგრვაზე."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"თქვენი ტელეფონი და პირადი მონაცემები უფრო დაუცველია უცნობი წყაროებიდან აპების შემოტევებისგან. თქვენ თანხმობას აცხადებთ, რომ მხოლოდ თქვენ ხართ პასუხისმგებელი ამ აპების გამოყენების შედეგად ტელეფონისთვის მიყენებულ ზიანსა და მონაცემების დაკარგვაზე."</string>
     <string name="verify_applications" msgid="2959359554974828518">"აპების ვერიფიკაცია"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Disallow or warn before installation of apps that may cause harm"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"ყველა აპის რეგულარული შემოწმება და პოტენციურად მავნე აპების აკრძალვა, ან გაფრთხილების ჩვენება"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"დამატებითი პარამეტრები"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"მეტი პარამეტრების ვარიანტების ჩართვა"</string>
     <string name="application_info_label" msgid="5736524913065714880">"აპლიკაციის შესახებ"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"ხმოვანი ზარები"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"მოცდის რეჟიმი"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"მოცდის რეჟიმი"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"ჩაუთვლელი"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"ზედმეტად ჩათვლილი"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"სულ ცენრალურ პროცესორში"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU აქტიური რეჟიმი"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ბატარეის დაზოგვის რეჟიმი"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"აპში შესაძლოა იყოს პარამეტრები ბატარეის ხარჯის შესამცირებლად"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"მომხმარებლის მიერ გამოყენებული ბატარეა"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"ჩაუთვლელი ელკვების გამოყენება"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ზედმეტად ჩათვლილი ელკვების გამოყენება"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> გამორთვის მომენტიდან"</string>
@@ -2087,4 +2089,10 @@
     <string name="drawer_open" msgid="132008699936863299">"ნავიგაციის სექციის გახსნა"</string>
     <string name="drawer_close" msgid="3329237203619660131">"ნავიგაციის სექციის დახურვა"</string>
     <string name="dashboard_title" msgid="821911564947991553">"მიმოხილვა"</string>
+    <!-- no translation found for lock_screen_notifications (736030096980572317) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (3873689304488434778) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7770997162767814840) -->
+    <skip />
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 63d8338..361e2da 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក និង​ទិន្នន័យ​ផ្ទាល់​ខ្លួន​ងាយ​រង​ការ​វាយប្រហារ​ដោយ​កម្មវិធី​ពី​ប្រភព​ដែល​មិន​ស្គាល់។ អ្នក​យល់ព្រម​ថា អ្នក​ទទួលខុសត្រូវ​រាល់​ការ​ខូចខាត​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក ឬ​បាត់បង់​ទិន្នន័យ​ដែល​បណ្ដាល​មក​ពី​ការ​ប្រើ​កម្មវិធី​ទាំង​នេះ។"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"ទូរស័ព្ទ និង​ទិន្នន័យ​ផ្ទាល់ខ្លួន​របស់​អ្នក​ងាយ​រង​​​​​ការ​វាយ​ប្រហារ​ដោយ​កម្មវិធី​ដែល​មិន​ស្គាល់​ប្រភព​ណាស់។ អ្នក​យល់ព្រម​ទទួលខុសត្រូវ​លើ​ការ​ខូច​ខាត​ទូរស័ព្ទ​របស់​អ្នក ឬ​បាត់បង់​ទិន្នន័យ​ដែល​បណ្ដាល​មក​ពី​ការ​ប្រើ​កម្មវិធី​ទាំង​នេះ។"</string>
     <string name="verify_applications" msgid="2959359554974828518">"ផ្ទៀងផ្ទាត់​កម្មវិធី"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"មិន​អនុញ្ញាត ឬ​ព្រមាន​មុន​ដំឡើង​កម្មវិធី​ដែល​អាច​​បង្ក​គ្រោះ​ថ្នាក់"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"ពិនិត្យ​កម្មវិធី​ទាំង​អស់​យ៉ាង​ទៀងទាត់​ និង​មិន​អនុញ្ញាត​ ឬ​ព្រមាន​អំពី​កម្មវិធី​ទាំង​នោះ​ដែល​អាច​​បង្ក​គ្រោះថ្នាក់"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"ការ​កំណត់​កម្រិត​ខ្ពស់"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"បើក​ជម្រើស​កំណត់​ច្រើន​ទៀត"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ព័ត៌មាន​កម្មវិធី"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"ការ​ហៅ​ជា​សំឡេង"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"កុំព្យូទ័រ​បន្ទះ​ទំនេរ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ទូរស័ព្ទ​ទំនេរ"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"មិន​រាប់​បញ្ចូល"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"លើស"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU សរុប"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ផ្ទៃ​ខាង​មុខ CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ជ្រើស​របៀប​សន្សំ​ថ្ម"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"កម្មវិធី​អាច​ផ្ដល់​ការ​កំណត់​ ដើម្បី​កាត់បន្ថយ​ការ​ប្រើ​ថ្ម"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ថ្ម​បាន​ប្រើ​ដោយ​អ្នក​ប្រើ"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"ការ​ប្រើ​ប្រាស់​​ថាមពល​ដែល​មិន​រាប់បញ្ចូល"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ការ​ប្រើ​ប្រាស់​ថាមពល​លើស"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> តាំង​ពី​បានដក"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"បើក​កា​រ​រុករក​​ថត"</string>
     <string name="drawer_close" msgid="3329237203619660131">"បិទ​ការ​រុករក​ថត"</string>
     <string name="dashboard_title" msgid="821911564947991553">"ទិដ្ឋភាព​ទូទៅ"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"បង្ហាញការជូនដំណឹង"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"នឹង​លាក់​មាតិកា​ជូនដំណឹង​សុវត្ថិភាព​ពេល​បាន​ចាក់សោ"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"នឹងបង្ហាញការជូនដំណឹងមាតិកា​ទាំងអស់​​ពេល​បាន​ចាក់សោ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c42e10d..4c81d1b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"태블릿 및 개인 정보는 출처를 알 수 없는 앱의 공격에 매우 취약합니다. 이러한 앱을 사용하여 발생할 수 있는 태블릿 손상이나 데이터 손실에 대한 책임은 사용자에게 있음에 동의합니다."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"휴대전화 및 개인 정보는 출처를 알 수 없는 앱의 공격에 매우 취약합니다. 이러한 앱을 사용하여 발생할 수 있는 휴대전화 손상이나 데이터 손실에 대한 책임은 사용자에게 있음에 동의합니다."</string>
     <string name="verify_applications" msgid="2959359554974828518">"앱 확인"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"유해할 수 있는 앱의 설치를 허용하지 않거나 경고 표시"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"정기적으로 앱을 확인하여 유해할 수 있는 앱을 허용하지 않거나 알립니다."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"고급 설정"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"기타 설정 옵션을 사용하도록 설정합니다."</string>
     <string name="application_info_label" msgid="5736524913065714880">"앱 정보"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"음성 통화"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"유휴 상태 태블릿"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"휴대전화 유휴 상태"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"산정되지 않음"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"과다 산정됨"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"총 CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 포그라운드"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"배터리 절약 모드 선택"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"앱에서 배터리 사용을 줄일 수 있는 설정을 제공할 수 있습니다."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"사용자의 배터리 사용"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"전력 사용량 산정되지 않음"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"전력 사용량 과다 산정됨"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"플러그를 뽑은 후 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"탐색 창 열기"</string>
     <string name="drawer_close" msgid="3329237203619660131">"탐색 창 닫기"</string>
     <string name="dashboard_title" msgid="821911564947991553">"개요"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"알림 표시"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"잠금 상태일 때 민감한 알림 콘텐츠가 숨겨집니다."</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"잠금 상태일 때 모든 알림 콘텐츠가 표시됩니다."</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index e7d7a0a..741dcbd 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"ແທັບເລັດ ແລະຂໍ້ມູນສ່ວນໂຕຂອງທ່ານ ສ່ຽງຕໍ່ການຖືກໂຈມຕີໂດຍແອັບຯທີ່ບໍ່ຮູ້ທີ່ມາ. ທ່ານຍອມຮັບວ່າທ່ານ ຈະເປັນຜູ່ຮັບຜິດຊອບຕໍ່ຄວາມເສຍຫາຍ ທີ່ມີຕໍ່ໂທລະສັບມືຖືຂອງທ່ານ ຫຼືການສູນເສຍຂໍ້ມູນ ທີ່ອາດເປັນຜົນມາຈາກການໃຊ້ແອັບພລິເຄຊັນເຫຼົ່ານີ້ແຕ່ພຽງຜູ່ດຽວ."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"ໂທລະສັບ ແລະຂໍ້ມູນສ່ວນໂຕຂອງທ່ານ ສ່ຽງຕໍ່ການຖືກໂຈມຕີໂດຍແອັບຯທີ່ບໍ່ຮູ້ທີ່ມາ. ທ່ານຍອມຮັບວ່າທ່ານ ຈະເປັນຜູ່ຮັບຜິດຊອບຕໍ່ຄວາມເສຍຫາຍ ທີ່ມີຕໍ່ໂທລະສັບມືຖືຂອງທ່ານ ຫຼືການສູນເສຍຂໍ້ມູນ ທີ່ອາດເປັນຜົນມາຈາກການໃຊ້ແອັບພລິເຄຊັນເຫຼົ່ານີ້ແຕ່ພຽງຜູ່ດຽວ."</string>
     <string name="verify_applications" msgid="2959359554974828518">"ຢືນຢັນແອັບຯ"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"ບໍ່ອະນຸຍາດ ຫຼືແຈ້ງເຕືອນກ່ອນການຕິດຕັ້ງແອັບຯ ທີ່ອາດກໍ່ໃຫ້ເກີດບັນຫາ"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"ກວດສອບແອັບຯທັງໝົດເປັນປະຈຳ ແລະ ບໍ່ອະນຸຍາດ ຫຼື ເຕືອນຫາກແອັບຯ​ອາດສ້າງອັນຕະລາຍ"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"ການຕັ້ງຄ່າຂັ້ນສູງ"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"ເປີດໃຊ້ໂຕເລືອກການຕັ້ງຄ່າເພີ່ມເຕີມ."</string>
     <string name="application_info_label" msgid="5736524913065714880">"ຂໍ້ມູນແອັບຯ"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"ການໂທດ້ວຍສຽງ"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ແທັບເລັດບໍ່ເຮັດວຽກ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ໂທລະ​ສັບ​ບໍ່​ເຮັດ​ວຽກ"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"ບໍ່ໄດ້ຄິດໄລ່"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"ຄິດໄລ່ເກີນ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ຮວມ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ພື້ນໜ້າ"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ເລືອກໂໝດປະຫຍັດໄຟ"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ແອັບຯອາດນຳສະເໜີການຕັ້ງຄ່າ ເພື່ອຫຼຸດການນຳໃຊ້ແບັດເຕີຣີ"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ແບັດເຕີຣີທີ່ໃຊ້ໂດຍຜູ່ໃຊ້"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"ການໃຊ້ພະລັງງານທີ່ບໍ່ໄດ້ຄິດໄລ່"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ການໃຊ້ພະລັງງານທີ່ຄິດໄລ່ເກີນ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ຕັ້ງແຕ່ຖອດສາຍສາກ"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"ເປີດລິ້ນຊັກໂຕນຳທາງ"</string>
     <string name="drawer_close" msgid="3329237203619660131">"ປິດລິ້ນຊັກນຳທາງ"</string>
     <string name="dashboard_title" msgid="821911564947991553">"ພາບ​ຮວມ"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"ສະແດງການແຈ້ງເຕືອນ"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"ເນື້ອຫາການແຈ້ງເຕືອນທີ່ມິຄວາມອ່ອນໄຫວ ຈະຖືກເຊື່ອງໄວ້ເມື່ອມີການລັອກ"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"ທຸກເນື້ອຫາການແຈ້ງເຕືອນ ຈະຖືກສະແດງເມື່ອມີການລັອກ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1c8f07a..bdd08b0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Planšetinis kompiuteris ir asmeniniai duomenys prastai apsaugoti nuo programų iš nežinomų šaltinių atakų. Sutinkate, kad tik jūs atsakote už visus planšetinio kompiuterio pažeidimus ar duomenų praradimą naudojant šias programas."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonas ir asmeniniai duomenys prastai apsaugoti nuo programų iš nežinomų šaltinių atakų. Sutinkate, kad tik jūs atsakote už visus telefono pažeidimus ar duomenų praradimą naudojant šias programas."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Patvirtinti programas"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Neleisti arba įspėti prieš diegiant programas, kurios gali būti kenksmingos"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Reguliariai tikrinkite visas programas ir išjunkite kenksmingas programas arba įspėkite apie jas"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Išplėstiniai nustatymai"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Įgalinti daugiau nustatymų parinkčių"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Programos informacija"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Balso skambučiai"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Planšetinis kompiuteris neveikos būsenos"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonas veikia laukimo režime"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neapskaičiuota"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Per daug apskaičiuota"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Visas CPU laikas"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU aktyvusis langas"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pasirinkite akumuliatoriaus tausojimo režimą"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Programa gali pasiūlyti nustatymus, kad būtų išeikvojama mažiau akumuliatoriaus energijos"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Naudotojo sunaudota akumuliatoriaus energija"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neapskaičiuotos energijos naudojimas"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Per daug apskaičiuotos energijos naudojimas"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> po to, kai buvo ištrauktas iš lizdo"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Atidaryti naršymo juostą"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Uždaryti naršymo juostą"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Apžvalga"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Rodyti pranešim."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Delik. praneš. turin. bus paslėpt., kai užrakinta"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Visas pranešimų turinys bus rodomas, kai užrakinta"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9f61028..1efe8a0 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Lietotnes no nezināmiem avotiem ir īpaši bīstamas jūsu planšetdatoram un personīgajiem datiem. Jūs piekrītat uzņemties vienpersonisku atbildību par jebkādiem planšetdatora bojājumiem vai datu zudumiem, ko var izraisīt šādu lietotņu izmantošana."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Lietotnes no nezināmiem avotiem ir īpaši bīstamas jūsu tālrunim un personīgajiem datiem. Jūs piekrītat uzņemties vienpersonisku atbildību par jebkādiem tālruņa bojājumiem vai datu zudumiem, ko var izraisīt šādu lietotņu izmantošana."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Pārbaudīt lietotnes"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Neļaut instalēt lietotnes, kuras var kaitēt, vai brīdināt par to instalēšanu"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Regulāri pārbaudīt visas lietotnes un brīdināt par lietotnēm, kas var nodarīt kaitējumu, vai neatļaut šādas lietotnes"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Papildu iestatījumi"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Iespējot papildu iestatījumu opcijas"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informācija par lietotni"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Balss zvani"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Planšetdators ir gaidstāvē"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Tālrunis dīkstāvē"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neuzskaitītais"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Par daudz uzskaitītais"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kopā"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU akt. režīms"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Atlasiet akumulatora jaudas taupīšanas režīmu"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Lietotnē var būt pieejami iestatījumi akumulatora enerģijas patēriņa samazināšanai"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Lietotāja patērētā akumulatora jauda"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neuzskaitītais enerģijas patēriņš"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Par daudz uzskaitītais enerģijas patēriņš"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> kopš atslēgšanas"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Atvērt navigācijas paneli"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Aizvērt navigācijas paneli"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Kopsavilkums"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Rādīt paziņojumus"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Bloķēšanas ekrānā netiks rādīti sensitīvi paziņoj."</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Bloķēšanas ekrānā tiks rādīti visi paziņojumi"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 8edadc1..70b914d 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Таны таблет болон хувийн мэдэээлэл тодорхойгүй эх үүсвэртэй апп-уудын халдлагад эмзэг байна. Та эдгээр апп-уудыг ашигласнаас үүдэн таны таблетад гарч болох гэмтэл, өгөгдлийг алдахад өөрөө дангаараа хариуцлага хүлээн гэдгийг зөвшөөрч байна."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Таны утас болон хувийн мэдээлэл тодорхойгүй эх үүсвэртэй апп-уудын халдлагад эмзэг байна. Та эдгээр апп-уудыг ашигласнаас үүдэн таны утсанд учирч болох гэмтэл буюу өгөгдлийн алдагдалд өөрөө дангаараа хариуцлага хүлээн гэдгийг зөвшөөрч байна."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Апп-уудыг тулгах"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Хор учруулж болзошгүй апп-уудыг суулгахын өмнө үл зөвшөөрөх буюу анхааруулах"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Бүх апп-г тогтмол шалгаж, аюул учруулж болох апп-уудыг зөвшөөрөхгүй эсвэл тэдгээрийн талаар анхааруулах"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Дэлгэрэнгүй тохиргоо"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Өөр тохиргоо сонголтыг идэвхжүүлнэ үү"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Апп мэдээлэл"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Дуугаар залгах"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Таблет идэвхгүй"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Утас идэвхгүй"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Бүртгэгдээгүй"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Хэтрүүлэн тооцсон"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU нийт"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ил"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Батерей хэмнэлтийн горимыг сонгох"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Апп зайны ашиглалтыг багасгах тохиргоог санал болгож болно"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Хэрэглэгчийн зарцуулсан зай"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Бүртгэгдээгүй цахилгаан ашиглалт"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Хэтрүүлэн тооцсон цахилгаан ашиглалт"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Салгаснаас хойш <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Навигацын татуургыг нээх"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Навигацын татуургыг хаах"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Тойм"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Мэдэгдлүүдийг харуулах"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Түгжээтэй үед нууцлалтай мэдэгдлийн агуулгыг харуулахгүй"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Түгжээтэй үед бүх мэдэгдлийн агуулгыг харуулна"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 1341bb9..152abce 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tablet dan data peribadi anda lebih terdedah kepada serangan oleh aplikasi dari sumber yang tidak diketahui. Anda bersetuju bahawa anda bertanggungjawab sepenuhnya bagi apa-apa kerosakan kepada tablet atau kehilangan data yang mungkin berlaku akibat penggunaan aplikasi ini."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefon dan data peribadi anda lebih terdedah kepada serangan oleh aplikasi dari sumber yang tidak diketahui. Anda bersetuju bahawa anda bertanggungjawab sepenuhnya untuk apa-apa kerosakan kepada telefon anda atau kehilangan data yang mungkin berlaku akibat menggunakan aplikasi ini."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Sahkan apl"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Larang atau beri amaran sebelum pemasangan apl yang mungkin membahayakan"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Semak semua apl secara kerap dan tolak atau berikan amaran mengenai apl yang boleh menyebabkan masalah"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Tetapan terperinci"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Dayakan lebih banyak pilihan tetapan"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Maklumat aplikasi"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Panggilan suara"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet melahu"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon melahu"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Tidak dapat dikesan"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Terlebih kira"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Jumlah CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pilih mod penjimatan bateri"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikasi ini mungkin menawarkan tetapan untuk mengurangkan penggunaan bateri"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateri digunakan oleh pengguna"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Penggunaan kuasa tidak dapat dikesan"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan kuasa terlebih kira"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak palam dicabut"</string>
@@ -2087,4 +2089,10 @@
     <string name="drawer_open" msgid="132008699936863299">"Buka laci navigasi"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Tutup laci navigasi"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Gambaran keseluruhan"</string>
+    <!-- no translation found for lock_screen_notifications (736030096980572317) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (3873689304488434778) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7770997162767814840) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a5d252a..033bf1c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Nettbrettet og personopplysningene dine er mer sårbare for angrep fra apper fra ukjente kilder. Du godtar at du alene er ansvarlig for enhver skade på nettbrettet eller tap av data som kan oppstå fra bruk av disse appene."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonen og personopplysninger er mer sårbare for angrep av apper fra ukjente kilder. Du godtar at du selv er ansvarlig for enhver skade på telefonen eller tap av data som kan skje ved å bruke disse appene."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Bekreft apper"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Forby eller advar før installasjon av apper som kan være skadelige"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Sjekk alle apper regelmessig, og avvis eller advar mot de som kan være skadelige"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avanserte innstillinger"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktiver flere innstillingsalternativer"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Info om appen"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Telefonsamtaler"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Nettbrettet ikke i bruk"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen ikke i bruk"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Ikke-beregnet"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Overberegnet"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Prosessor totalt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Prosessor i forgrunnen"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Velg batterisparingsmodus"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Appen kan ha innstillinger som kan redusere batteribruken"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batteri brukt av brukeren"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Ikke-beregnet strømforbruk"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overberegnet strømforbruk"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden strømmen ble frakoblet"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Åpne navigasjonsskuffen"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Lukk navigasjonsskuffen"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Oversikt"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Vis varsler"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Sensitivt varselinnhold skjules på låseskjermen"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Alt varselinnhold vises på låseskjermen"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a9f0fe9..00a9e5d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Uw tablet en persoonlijke gegevens zijn gevoeliger voor aanvallen door apps van onbekende bronnen. U gaat ermee akkoord dat alleen u verantwoordelijk bent voor enige schade aan uw tablet of verlies van gegevens die voortkomen uit het gebruik van deze apps."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Uw telefoon en persoonlijke gegevens worden door apps van onbekende bronnen gevoeliger voor aanvallen. U gaat ermee akkoord dat alleen u verantwoordelijk bent voor enige schade aan uw telefoon of verlies van gegevens die voortkomen uit het gebruik van deze apps."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Apps verifiëren"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"De installatie van apps die schade kunnen veroorzaken niet toestaan of eerst waarschuwen"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Controleer alle apps regelmatig en verwijder de rechten of stel een waarschuwing in voor apps die mogelijk schadelijk zijn"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Geavanceerde instellingen"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Meer opties voor instellingen inschakelen"</string>
     <string name="application_info_label" msgid="5736524913065714880">"App-info"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Spraakoproepen"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactief"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefoon inactief"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Onverklaard"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Te hoog berekend"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU op voorgrond"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Accubesparingsmodus selecteren"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"De app kan instellingen aanbieden om het accugebruik te beperken"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Accu gebruikt door gebruiker"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Onverklaard stroomgebruik"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Te hoog berekend stroomgebruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sinds losgekoppeld"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Navigatielade openen"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Navigatielade sluiten"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Overzicht"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Meldingen weergeven"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Inhoud van gevoelige meldingen wordt verborgen indien vergrendeld"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Inhoud van alle meldingen wordt weergegeven indien vergrendeld"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ea5cd62..3c27a25 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Twój tablet i dane osobiste są bardziej narażone na ataki aplikacji z nieznanych źródeł. Akceptujesz fakt, że ponosisz wyłączną odpowiedzialność za wszelkie możliwe szkody w tablecie i utratę danych w wyniku korzystania z tych aplikacji."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Twój telefon i dane osobiste są bardziej narażone na ataki aplikacji z nieznanych źródeł. Akceptujesz fakt, że ponosisz wyłączną odpowiedzialność za wszelkie możliwe szkody w telefonie i utratę danych w wyniku korzystania z tych aplikacji."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Weryfikuj aplikacje"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Zablokuj instalowanie potencjalnie szkodliwych aplikacji lub wyświetl ostrzeżenie przed instalacją"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Regularnie sprawdzaj wszystkie aplikacje i blokuj lub zgłaszaj te, które mogą spowodować szkody"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ustawienia zaawansowane"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Włącz więcej opcji ustawień."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informacje o aplikacji"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Połączenia głosowe"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet nieaktywny"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon nieaktywny"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Nierozliczone"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Obliczone z nadmiarem"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU łącznie"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU (pierwszy plan)"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Wybierz tryb oszczędzania baterii"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikacja może oferować ustawienia pozwalające zmniejszyć użycie baterii."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Użycie baterii przez użytkownika"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Nierozliczone zużycie energii"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zużycie energii obliczone z nadmiarem"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odłączenia"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Otwórz szufladę nawigacji"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Zamknij szufladę nawigacji"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Omówienie"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Pokaż powiadomienia"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"W trybie blokady treść poufna powiadomień będzie ukryta"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"W trybie blokady cała treść powiadomień będzie widoczna"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 27499de..bb0cf86 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"O tablet e os dados pessoais estão mais vulneráveis ​​a ataques de aplicações de fontes desconhecidas. O utilizador concorda que é o único responsável por qualquer dano causado ao tablet ou perda de dados que possam resultar da utilização destas aplicações."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"O telemóvel e os dados pessoais estão mais vulneráveis ​​a ataques de aplicações de fontes desconhecidas. O utilizador concorda que é o único responsável por qualquer dano causado ao telemóvel ou perda de dados que possam resultar da utilização dessas aplicações."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verificar aplicações"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Proibir ou avisar antes da instalação de aplicações que possam causar danos"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Verificar regularmente todas as aplicações e não permitir a instalação/utilização ou avisar relativamente a aplicações prejudiciais"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Definições avançadas"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Ativar mais opções de definições"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informações da aplicação"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactivo"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone inactivo"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Não contabilizada"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Contabilizada em excesso"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primeiro plano da CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecionar o modo de poupança de bateria"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"A aplicação pode sugerir definições para reduzir a utilização da bateria"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateria usada pelo utilizador"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Utilização de energia não contabilizada"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilização de energia contabilizada em excesso"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desligado"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Abrir gaveta de navegação"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Fechar gaveta de navegação"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Descrição geral"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Mostrar notif."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"O cont. de notif. conf. será ocult. c/ ecrã bloq."</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"O cont. de todas notif. será mostr. c/ ecrã bloq."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 95912c6..510e129 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Seu tablet e seus dados pessoais são mais vulneráveis ​​a ataques de aplicativos de fontes desconhecidas. Você concorda que é o único responsável por qualquer dano a seu tablet ou perda de dados decorrentes do uso desses aplicativos."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Seu telefone e seus dados pessoais são mais vulneráveis ​​a ataques de aplicativos de fontes desconhecidas. Você concorda que é o único responsável por qualquer dano ao seu telefone ou perda de dados decorrentes do uso desses aplicativos."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verificar aplicativos"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Proibir ou avisar antes da instalação de aplicativos que podem causar danos"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Verifica regularmente todos os aplicativos e bloqueia ou emite avisos sobre aplicativos perigosos"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Ativa mais opções de configuração"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informações do app"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ocioso"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone ocioso"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Não estimado"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Superestimado"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU prioritária"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecionar modo de economia de bateria"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"O aplicativo pode oferecer configurações para reduzir o uso da bateria"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateria utilizada pelo usuário"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consumo de energia não estimado"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desconectado"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Abrir gaveta de navegação"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Fechar gaveta de navegação"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Visão geral"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Mostrar notific."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Notificações confidenciais ocultas ao bloquear"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Conteúdo de notificações exibido ao bloquear"</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 320dd9a..3c7f967 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -1683,7 +1683,7 @@
     <skip />
     <!-- no translation found for verify_applications (2959359554974828518) -->
     <skip />
-    <!-- no translation found for verify_applications_summary (6737505521913263792) -->
+    <!-- no translation found for verify_applications_summary (2013363344093910880) -->
     <skip />
     <!-- no translation found for advanced_settings (1777249286757067969) -->
     <skip />
@@ -2384,7 +2384,7 @@
     <!-- no translation found for power_idle (4612478572401640759) -->
     <skip />
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inactiv"</string>
-    <!-- no translation found for power_unaccounted (4835429811853042257) -->
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
     <skip />
     <!-- no translation found for power_overcounted (2762354976171358445) -->
     <skip />
@@ -2455,7 +2455,7 @@
     <skip />
     <!-- no translation found for battery_desc_users (7682989161885027823) -->
     <skip />
-    <!-- no translation found for battery_desc_unaccounted (1653798876416893745) -->
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
     <skip />
     <!-- no translation found for battery_desc_overcounted (5481865509489228603) -->
     <skip />
@@ -3451,4 +3451,10 @@
     <skip />
     <!-- no translation found for dashboard_title (821911564947991553) -->
     <skip />
+    <!-- no translation found for lock_screen_notifications (736030096980572317) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (3873689304488434778) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7770997162767814840) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 12f0f9a..3d373e9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tableta şi datele dvs. personale sunt mai vulnerabile la un atac din partea aplicaţiilor ce provin din surse necunoscute. Sunteţi de acord că sunteţi singura persoană responsabilă pentru deteriorarea tabletei sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicaţii."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonul şi datele dvs. personale sunt mai vulnerabile la un atac din partea aplicaţiilor ce provin din surse necunoscute. Sunteţi de acord că sunteţi singura persoană responsabilă pentru deteriorarea telefonului sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicaţii."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verificaţi aplicaţiile"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Respingeţi sau avertizaţi înainte de instalarea unor aplicaţii care pot cauza daune"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Verificați periodic toate aplicațiile și respingeți sau semnalați aplicațiile care pot fi dăunătoare"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setări avansate"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activaţi mai multe opţiuni pentru setări"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informaţii despre aplicaţie"</string>
@@ -1512,7 +1512,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Apeluri vocale"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tableta inactivă"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inactiv"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neînregistrat"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Supraevaluat"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total procesor"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor în prim plan"</string>
@@ -1556,7 +1557,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selectați modul de economisire a bateriei"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplicaţia poate oferi setări pentru reducerea utilizării bateriei"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterie utilizată de utilizator"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consumul neînregistrat al bateriei"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumul supraevaluat al bateriei"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> de la deconectare"</string>
@@ -2088,4 +2090,10 @@
     <string name="drawer_open" msgid="132008699936863299">"Deschideți panoul de navigare"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Închideți panoul de navigare"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Prezentare"</string>
+    <!-- no translation found for lock_screen_notifications (736030096980572317) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (3873689304488434778) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7770997162767814840) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 53a055c..4ea8045 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Ваши личные данные и данные планшетного ПК более уязвимы для атак приложений из неизвестных источников. Вы соглашаетесь с тем, что несете полную ответственность за любой ущерб, нанесенный планшетному ПК, и потерю данных, связанные с использованием этих приложений."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Ваши личные данные и данные телефона более уязвимы для атак приложений из неизвестных источников. Вы соглашаетесь с тем, что несете полную ответственность за любой ущерб, нанесенный телефону, и потерю данных, связанные с использованием этих приложений."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Проверять приложения"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Запрещать установку приложений, которые могут нанести вред устройству, или предупреждать о них"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Регулярно проверять все приложения и отключать те, которые могут нанести вред, или предупреждать о них"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Расширенные настройки"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Включить дополнительные настройки"</string>
     <string name="application_info_label" msgid="5736524913065714880">"О приложении"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Голосовые вызовы"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Планшетный ПК в режиме ожидания"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Режим ожидания"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Неучтенное"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Переучтенное"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"ЦП – всего"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ЦП – акт. режим"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Выберите режим экономии заряда батареи"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"В программе могут быть настройки режима энергосбережения"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Использование батареи пользователем"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Неучтенное энергопотребление"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Преувеличенное энергопотребление"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА·ч"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> с момента отключения от питания"</string>
@@ -2089,4 +2091,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Открыть панель навигации"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Закрыть панель навигации"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Обзор"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Уведомления"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Не показывать конфиденциальные данные"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Показывать уведомления полностью"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f03c2f9..a6c2617 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -807,7 +807,7 @@
     <string name="device_status" msgid="607405385799807324">"Stav"</string>
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Stav batérie, siete a ďalšie informácie"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefónne číslo, signál atď."</string>
-    <string name="storage_settings" msgid="4211799979832404953">"Ukladací priestor"</string>
+    <string name="storage_settings" msgid="4211799979832404953">"Úložisko"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Nastavenia ukladacieho priestoru"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Odpojiť ukladací priestor USB a zobraziť dostupný ukladací priestor"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Umožňuje odpojiť kartu SD a zobraziť dostupný ukladací priestor"</string>
@@ -1096,11 +1096,11 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Váš tablet a osobné údaje sú zraniteľnejšie voči útokom aplikácií z neznámych zdrojov. Súhlasíte s tým, že ste výhradne zodpovedný/-á za všetky škody na tablete alebo stratu údajov, ktoré môžu vzniknúť v dôsledku používania týchto aplikácií."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Váš telefón a osobné údaje sú zraniteľnejšie voči útokom aplikácií z neznámych zdrojov. Súhlasíte s tým, že ste výhradne zodpovedný/-á za všetky škody na telefóne alebo stratu údajov, ktoré môžu vzniknúť v dôsledku používania týchto aplikácií."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Overiť aplikácie"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Zakázať inštaláciu škodlivých aplikácií alebo na ne upozorniť"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Pravidelne kontrolujte všetky aplikácie a ak nájdete také, ktoré vám môžu uškodiť, zakážte ich alebo nás na ne upozornite"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Rozšírené nastavenia"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Povoliť ďalšie možnosti nastavení"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informácie o aplikácii"</string>
-    <string name="storage_label" msgid="8700867073480107253">"Ukladací priestor"</string>
+    <string name="storage_label" msgid="8700867073480107253">"Úložisko"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Spúšťať ako predvolenú"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Predvolené"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Kompatibilita obrazovky"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet je nečinný"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefón v stave nečinnosti"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neznáma"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Nadsadená"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Doba prevádzky procesora"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popredí"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Vyberte režim úspory batérie"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Táto aplikácia môže ponúkať nastavenia na zníženie používania batérie"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Využitie batérie používateľom"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neznáma spotreba energie"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadsadená spotreba energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojenia"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Otvoriť priečinok s navigáciou"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Zavrieť priečinok s navigáciou"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Prehľad"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Zobraziť upozor."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Po uzamk. sa obsah citlivých upozornení nezobrazí"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Po uzamknutí sa zobrazí obsah všetkých upozornení"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index a76f239..cc9408f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Programi iz neznanih virov lažje napadejo tablični računalnik in osebne podatke. Strinjate se, da ste za morebitno škodo, nastalo v tabličnem računalniku, ali izgubo podatkov, ki sta posledica uporabe teh programov, odgovorni izključno sami."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Programi iz neznanih virov lažje napadejo telefon in osebne podatke. Strinjate se, da ste izključno sami odgovorni za morebitno škodo, nastalo v telefonu, ali izgubo podatkov, ki sta posledica uporabe teh programov."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Preverjanje aplikacij"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Ne dovoli namestitve ali opozori pred namestitvijo aplikacije, ki je lahko škodljiva"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Redno preverjajte vse aplikacije in onemogočajte tiste, ki bi morda povzročile škodo, ali opozarjajte nanje"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Dodatne nastavitve"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Omogoči več možnosti nastavitev."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Podatki o aplikaciji"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Glasovni klici"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablični računalnik nedejaven"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon je nedejaven"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neevidentirano"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Preveč šteto"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Skupni čas za CPE"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ospredje CPE"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Izberite način za varčevanje z energijo akumulatorja"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Program morda omogoča nastavitve za zmanjšanje porabe energije"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Energija, ki jo je porabil uporabnik"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neevidentirana uporaba energije"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Preveč šteta uporaba energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odklopa"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Odpri predal za krmarjenje"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Zapri predal za krmarjenje"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Pregled"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Pokaži obvestila"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Ob zaklen. zaslonu bo skrita občut. vseb. obvestil"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Ob zaklen. zaslonu bo prikaz. vsa vsebina obvestil"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 1afca65..1b113bd 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Таблет и лични подаци су подложнији нападу апликација из непознатих извора. Сагласни сте да сте само ви одговорни за сву штету на таблету или губитак података до којих може да дође услед коришћења ових апликација."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Телефон и лични подаци су подложнији нападу апликација из непознатих извора. Сагласни сте да сте само ви одговорни за сву штету на телефону или губитак података до којих може да дође услед коришћења ових апликација."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Верификуј апликације"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Онемогућава инсталирање апликација које могу да буду штетне или упозорава пре инсталирања"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Редовно проверава све апликације и онемогућава оне које су потенцијално штетне или шаље упозорења о њима"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Напредна подешавања"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Омогући још опција подешавања"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Информације о апликацији"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Гласовни позиви"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Таблет је у стању мировања"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Телефон у мировању"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Непозната"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Прекомерно израчуната"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Укупно коришћење процесора"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор у предњем плану"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Изаберите режим уштеде батерије"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Апликација може да понуди подешавања како би се смањило коришћење батерије"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Батерија коју користи корисник"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Непозната потрошња батерије"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Прекомерно израчуната потрошња енергије"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> од искључивања"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Отворите фиоку за навигацију"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Затворите фиоку за навигацију"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Преглед"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Приказ обавештења"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Осетљив садржај обавештења се сакрива на закључаном екрану"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Цела обавештења се приказују на закључаном екрану"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index eeb2670..39b9f98 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Surfplattan och dina personliga data är mer sårbara för angrepp av appar från okända källor. Du godkänner att du ensam är ansvarig för eventuella skador på surfplattan eller förlust av data som kan uppstå när du använder dessa appar."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Mobilen och dina personuppgifter är sårbara för angrepp av appar från okända källor. Du godkänner att du ensam är ansvarig för eventuella skador på mobilen eller förlust av data som orsakats av att du använt dessa appar."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verifiera appar"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Tillåt inte installation av appar som kan orsaka skada eller varna innan"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Kontrollera alla appar regelbundet och blockera eller varna för de som kan vara skadliga"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avancerade inställningar"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktivera fler inställningsalternativ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Info om appen"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Röstsamtal"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Surfplattan är inaktiv"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen är inaktiv"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Oräknad"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"För högt räknad"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU totalt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU i förgrunden"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Välj batterisparläge"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Appen erbjuder eventuellt inställningar som minskar batteriförbrukningen"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batteri som förbrukats av användaren"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Oräknad strömförbrukning"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"För högt räknad strömförbrukning"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedan bortkoppling"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Öppna navigeringspanelen"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Stäng navigeringspanelen"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Översikt"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Visa aviseringar"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Känsliga aviseringar döljs när skärmen är låst"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Allt aviseringsinnehåll visas när skärmen är låst"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index fe8feb9..e8916b2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1090,7 +1090,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Kompyuta yako ndogo na data ya kibinafsi iko hatarini kushambuliwa na programu kutoka kwa vyanzo visivyojulikana. Unakubali kuwa unawajibika mwenyewe kwa uharibifu wowote kwa kompyuta yako ndogo au kupoteza data ambayo inaweza kutokana kwa kutumia programu hizi."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Simu yako na data ya kibinafsi inaweza kushambuliwa na programu kutoka kwa vyanzo visivyojulikana. Unakubali kuwa unawajibika mwenyewe kwa uharibifu wowote kwa simu yako au kupoteza data ambayo inaweza kusababishwa kutokana na kutumiwa na programu hizi."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Thibitisha programu"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Nyima ruhusa au onya kabla ya usakinishaji wa programu ambayo inaweza kusababisha madhara"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Angalia programu zote mara kwa mara na uondoe ruhusa au uonye kuhusu programu zinazoweza kusababisha madhara"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Mipangilio ya kina"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Wezesha chaguo zaidi ya mipangilio."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Maelezo ya programu"</string>
@@ -1505,7 +1505,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Simu za sauti"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Kompyuta kibao haitumiki"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Wakati simu haitumiki"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Isiyorekodiwa"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Hesabu iliyopitiliza"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kwa jumla"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Mandharimbele ya CPU"</string>
@@ -1549,7 +1550,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Chagua hali inayookoa betri"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Huenda programu ikatoa mipangilio ya kupunguza utumiaji wa betri"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Betri imetumiwa na mtumiaji"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Matumizi ya nishati yasiyokuwa na rekodi"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Hesabu ya matumizi ya nishati iliyopitiliza"</string>
     <string name="mah" msgid="95245196971239711">"mAh <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> tangu ilipoondolewa"</string>
@@ -1762,7 +1764,7 @@
     <string name="last_synced" msgid="4242919465367022234">"Ilisawazishwa mwisho <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Inasawazisha sasa..."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Mipangilio ya kuhifadhi nakala rudufu"</string>
-    <string name="settings_backup_summary" msgid="7916877705938054035">"Cheleza mipangilio yangu"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Hifadhi nakala za mipangilio yangu"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sawazisha sasa"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Ghairi usawazishaji"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Gusa ili kusawazisha sasa<xliff:g id="LAST_SYNC_TIME">
@@ -2081,4 +2083,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Fungua menyu"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Funga menyu"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Muhtasari"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Onyesha arifa"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Maudhui ya arifa nyeti yatafichwa inapokuwa imefungwa"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Maudhui yote ya arifa yataonyeshwa inapokuwa imefungwa"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 83b5fda..67fb641 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -957,7 +957,7 @@
     <string name="media_format_desc" product="default" msgid="8764037252319942415">"ลบการ์ด SD หรือไม่ คุณจะสูญเสียข้อมูล"<b>"ทั้งหมด"</b>"บนการ์ด!"</string>
     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"ลบที่เก็บข้อมูล USB"</string>
     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"ลบการ์ด SD"</string>
-    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"ลบที่จัดเก็บข้อมูล USB ซึ่งจะเป็นการลบไฟล์ทั้งหมดที่จัดเก็บอยู่ในนั้นหรือไม่ คุณไม่สามารถย้อนกลับการทำงานนี้ได้!"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"ลบที่จัดเก็บข้อมูล USB ซึ่งจะเป็นการลบไฟล์ทั้งหมดที่จัดเก็บอยู่ในนั้นหรือไม่ คุณไม่สามารถกลับการทำงานนี้ได้!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"ต้องการลบการ์ด SD ซึ่งจะเป็นการลบไฟล์ทั้งหมดที่จัดเก็บไว้หรือไม่ คุณไม่สามารถย้อนกลับการทำงานนี้ได้!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"ลบทุกอย่าง"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"วาดรูปแบบการปลดล็อก"</string>
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"แท็บเล็ตและข้อมูลส่วนบุคคลของคุณมีความเสี่ยงสูงยิ่งขึ้นที่จะถูกโจมตีโดยแอปพลิเคชันที่มาจากแหล่งที่ไม่รู้จัก คุณยอมรับว่าคุณเป็นผู้รับผิดชอบแต่เพียงผู้เดียวต่อความเสียหายของแท็บเล็ตหรือการสูญหายของข้อมูลที่อาจเป็นผลจากการใช้แอปพลิเคชันเหล่านี้"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"โทรศัพท์และข้อมูลส่วนบุคคลของคุณมีความเสี่ยงยิ่งขึ้นที่จะถูกโจมตีจากแอปพลิเคชันที่ไม่รู้จักแหล่งที่มา คุณยอมรับว่าคุณจะเป็นผู้รับผิดชอบแต่เพียงผู้เดียวต่อความเสียหายใดๆ ที่เกิดกับโทรศัพท์หรือหรือการสูญเสียข้อมูลที่เป็นผลจากการใช้แอปพลิเคชันเหล่านี้"</string>
     <string name="verify_applications" msgid="2959359554974828518">"ยืนยันแอปพลิเคชัน"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"ไม่อนุญาตหรือแจ้งเตือนก่อนที่จะติดตั้งแอปที่อาจก่อให้เกิดอันตราย"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"ตรวจสอบแอปทั้งหมดอย่างสม่ำเสมอและไม่อนุญาตหรือเตือนเกี่ยวกับสิ่งที่อาจเป็นอันตราย"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"การตั้งค่าขั้นสูง"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"เปิดใช้งานตัวเลือกการตั้งค่าเพิ่มเติม"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ข้อมูลแอปพลิเคชัน"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"การโทรด้วยเสียง"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ไม่มีการใช้งานแท็บเล็ต"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ไม่มีการใช้งานโทรศัพท์"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"ไม่สามารถคำนวณ"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"คำนวณมากเกินไป"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU รวม"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ส่วนหน้าของ CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"เลือกโหมดประหยัดแบตเตอรี่"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"แอปพลิเคชันอาจเสนอการตั้งค่าที่ลดการใช้แบตเตอรี่"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"แบตเตอรี่ที่ใช้โดยผู้ใช้"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"การใช้พลังงานที่ไม่สามารถคำนวณ"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"การใช้พลังงานที่คำนวณมากเกินไป"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ตั้งแต่ถอดปลั๊ก"</string>
@@ -1731,7 +1733,7 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"รีเฟรชรายการ"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"ข้าม"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"ถัดไป"</string>
-    <string name="wifi_setup_back" msgid="144777383739164044">"ย้อนกลับ"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"กลับ"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"รายละเอียดเครือข่าย"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"เชื่อมต่อ"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"ลืม"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"เปิดลิ้นชักการนำทาง"</string>
     <string name="drawer_close" msgid="3329237203619660131">"ปิดลิ้นชักการนำทาง"</string>
     <string name="dashboard_title" msgid="821911564947991553">"ภาพรวม"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"แสดงการแจ้งเตือน"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"เนื้อหาแจ้งเตือนที่ละเอียดอ่อนจะถูกซ่อนไปเมื่อล็อก"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"เนื้อหาการแจ้งเตือนทั้งหมดจะแสดงขึ้นเมื่อล็อก"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 323388a..16cfc3e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Mas madaling mapinsala ang iyong tablet at personal na data ng atake ng apps mula sa hindi alam na mga pinagmulan. Sumasang-ayon ka na ikaw ang tanging mananagot para sa anumang pinsala sa iyong tablet o pagkawala ng data na maaaring magresulta mula sa paggamit ng apps na ito."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Mas madaling mapinsala ang iyong telepono at personal na data ng atake ng apps mula sa hindi alam na mga pinagmulan. Sumasang-ayon ka na ikaw ang tanging mananagot para sa anumang pinsala sa iyong telepono o pagkawala ng data na maaaring magresulta mula sa paggamit ng apps na ito."</string>
     <string name="verify_applications" msgid="2959359554974828518">"I-verify ang apps"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Huwag payagan o magbigay babala bago ang pag-install ng apps na maaaring makahamak"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Regular na suriin ang lahat ng app at huwag payagan o magbigay ng babala tungkol sa mga maaaring maging sanhi ng pinsala"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Mga advanced na setting"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Paganahin ang higit pang mga pagpipilian sa mga setting"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Impormasyon ng app"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Mga boses ng tawag"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Idle ang tablet"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Idle ang telepono"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Hindi nakalkula"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Sobrang nakalkula"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Kabuuan ng CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Piliin ang battery-saving mode"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Maaaring mag-alok ang app ng mga setting upang mabawasan ang paggamit ng baterya"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateryang ginamit ng user"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Hindi nakalkulang paggamit ng power"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sobrang nakalkulang paggamit ng power"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> (na) mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> mula nang na-unplug"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Buksan ang drawer ng pag-navigate"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Isara ang drawer ng pag-navigate"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Overview"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Show notifications"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Nakatago ang sensitive notification contents pag naka-lock"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Kita ang nilalaman ng notification kapag naka-lock"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b6bc7a1..7d5bf6b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tabletiniz ve kişisel verileriniz, bilinmeyen kaynaklardan gelen uygulamaların saldırılarına karşı daha savunmasızdır. Bu uygulamaları kullanmanız sonucunda tabletinizin başına gelebilecek her tür hasardan ve veri kaybından yalnızca kendinizin sorumlu olduğunu kabul edersiniz."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonunuz ve kişisel verileriniz, bilinmeyen kaynaklardan gelen uygulamaların saldırılarına karşı daha savunmasızdır. Bu uygulamaları kullanmanız sonucunda telefonunuzun başına gelebilecek her tür hasardan ve veri kaybından yalnızca kendinizin sorumlu olduğunu kabul edersiniz."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Uygulamaları doğrula"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Zararlı olabilecek uygulamaların yüklenmesine izin verme veya uyar"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Tüm uygulamaları düzenli olarak kontrol et ve zarar verebilecek uygulamalara izin verme veya bu tür uygulamalarla ilgili uyarıda bulun"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Gelişmiş ayarlar"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Diğer ayar seçeneklerini etkinleştirin."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Uygulama bilgileri"</string>
@@ -1424,8 +1424,8 @@
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"Özel seçenekler"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"Arka plan rengi"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"Arka plan şeffaflığı"</string>
-    <string name="captioning_window_color" msgid="6902052743419717394">"Başlık penceresi rengi"</string>
-    <string name="captioning_window_opacity" msgid="5041556024849862376">"Başlık penceresi opaklığı"</string>
+    <string name="captioning_window_color" msgid="6902052743419717394">"Altyazı penceresi rengi"</string>
+    <string name="captioning_window_opacity" msgid="5041556024849862376">"Altyazı penceresi opaklığı"</string>
     <string name="captioning_foreground_color" msgid="85623486537640059">"Metin rengi"</string>
     <string name="captioning_foreground_opacity" msgid="4370967856995419788">"Metin opaklığı"</string>
     <string name="captioning_edge_color" msgid="3670094753735263238">"Kenar rengi"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Sesli aramalar"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet boşta"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon boşta"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Yetersiz hesaplandı"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Fazla hesaplandı"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Toplam CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ön planı"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pil tasarrufu modunu seçin"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Uygulama, pil kullanımını azaltmak için ayarlar önerebilir"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Kullanıcı tarafından harcanan pil miktarı"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Hesaplanmayan güç kullanımı"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Fazla hesaplanan güç kullanımı"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Fişten çekildikten itibaren <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Gezinme çekmecesini aç"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Gezinme çekmecesini kapat"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Genel Bakış"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Bildirim göster"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Kilitliyken hassas bildirim içerikleri gizlenecek"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Kilitliyken tüm bildirim içerikleri gösterilecek"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4edcff2..baef20f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Ваш планшетний ПК і особисті дані більш уразливі до атак із боку програм із невідомих джерел. Ви погоджуєтеся з тим, що несете особисту відповідальність за будь-яку заподіяну вашому планшетному ПК шкоду чи втрату даних унаслідок використання таких програм."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Ваш телефон і особисті дані більш уразливі до атак із боку програм із невідомих джерел. Ви погоджуєтеся з тим, що несете особисту відповідальність за будь-яку заподіяну вашому телефону шкоду чи втрату даних унаслідок використання таких програм."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Перевіряти програми"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Заборонити встановлення шкідливих програм або попереджати про них."</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Періодично перевіряти всі додатки та попереджати про шкідливі"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Розширені налаштування"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Увімкнути додаткові варіанти налаштувань"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Інформація про програму"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Голос. дзвінки"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Режим очікув."</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Режим очік."</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Невраховане"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Переоцінене"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Заг. ЦП"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Актив. процеси ЦП"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Виберіть режим економії заряду акумулятора"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"У програмі можуть бути налаштування режиму енергозбереження"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Використання акумулятора користувачем"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Невраховане енергоспоживання"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Переоцінене енергоспоживання"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА/год"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> з часу відключ."</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Відкрити панель навігації"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Сховати панель навігації"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Огляд"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Показ.сповіщення"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Після блокування особисті відомості буде приховано"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Після блокування всі відомості відображатимуться"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d7760ba..bb2bd43 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Máy tính bảng và dữ liệu cá nhân của bạn dễ bị tấn công hơn bởi các ứng dụng từ nguồn không xác đinh. Bạn đồng ý rằng bạn tự chịu trách nhiệm cho mọi hỏng hóc đối với máy tính bảng của bạn hoặc mất mát dữ liệu có thể phát sinh do sử dụng những ứng dụng này."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Điện thoại và dữ liệu cá nhân của bạn dễ bị tấn công hơn bởi các ứng dụng từ nguồn không xác đinh. Bạn đồng ý rằng bạn tự chịu trách nhiệm cho mọi hỏng hóc đối với điện thoại của bạn hoặc mất mát dữ liệu có thể phát sinh do sử dụng những ứng dụng này."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Xác minh các ứng dụng"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Không cho phép hoặc cảnh báo trước khi cài đặt ứng dụng có thể gây hại"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Thường xuyên kiểm tra tất cả các ứng dụng và không cho phép hoặc cảnh báo về những ứng dụng có thể gây hại"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Cài đặt nâng cao"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Bật thêm tùy chọn cài đặt"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Thông tin về ứng dụng"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Cuộc gọi thoại"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Máy tính bảng ở chế độ rảnh"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Điện thoại ở chế độ rảnh"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Dưới mức"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Vượt mức"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU tổng"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Nền trước CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Chọn chế độ tiết kiệm pin"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Ứng dụng có thể cung cấp các cài đặt để giảm mức sử dụng pin"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Pin do người dùng sử dụng"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Sử dụng nguồn dưới mức"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sử dụng nguồn vượt mức"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> từ khi tháo đầu cắm"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Mở ngăn điều hướng"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Đóng ngăn điều hướng"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Tổng quan"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"H.thị thông báo"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Nội dung thông báo nhạy cảm sẽ được ẩn khi bị khóa"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Tất cả nội dung thông báo sẽ hiển thị khi bị khóa"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6eff47d..e155b09 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"您的平板电脑和个人数据更容易受到从未知来源获取的应用的攻击。对于因使用这些应用而造成的平板电脑损坏或数据丢失，您同意自行承担全部责任。"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"您的手机和个人数据更容易受到从未知来源获取的应用的攻击。对于因使用这些应用而造成的手机损坏或数据丢失，您同意自行承担全部责任。"</string>
     <string name="verify_applications" msgid="2959359554974828518">"验证应用"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"禁止安装可能会造成危害的应用，或在安装前提出警告"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"定期检查所有应用，一旦发现可能会产生危害的应用，则将其禁止或向您发出警告"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"高级设置"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"启用更多设置选项"</string>
     <string name="application_info_label" msgid="5736524913065714880">"应用信息"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"语音通话"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"平板电脑待机"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"手机待机"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"未计算在内的"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"多算了的"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 总使用时间"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU（前台）"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"选择“耗电量低”模式"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"该应用中可能提供了用于减少耗电量的设置"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"用户所耗电量"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"未计算在内的用电量"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"多算了的用电量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>毫安时"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔下电源后已过 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"打开抽屉式导航栏"</string>
     <string name="drawer_close" msgid="3329237203619660131">"关闭抽屉式导航栏"</string>
     <string name="dashboard_title" msgid="821911564947991553">"概览"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"显示通知"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"屏幕锁定时，系统会隐藏敏感的通知内容"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"屏幕锁定时，系统会显示所有通知内容"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 3c24108..7568eae 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"來源不明的應用程式可能會損害您的平板電腦及個人資料，如因使用這些應用程式導致平板電腦受損或資料遺失，請自行承擔責任。"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"不明來源的應用程式可能會損害您的手機及個人資訊。如因使用這些應用程式而造成手機受損或資料遺失，您必須自行承擔責任。"</string>
     <string name="verify_applications" msgid="2959359554974828518">"驗證應用程式"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"不允許安裝可能造成傷害的應用程式，或在安裝前提出警告"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"定期檢查所有應用程式，並在發現可能造成損害的應用程式時禁止使用或發出警告"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"進階設定"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"啟用更多設定選項"</string>
     <string name="application_info_label" msgid="5736524913065714880">"應用程式資訊"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"語音通話"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"平板電腦閒置"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"用途不明"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"計算過高"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前端使用狀況"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"選取節約電池用量模式"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"應用程式可能有提供節省電力的設定"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"用戶用電量"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"用途不明的用電量"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"計算過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔除插頭後已耗電 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2091,4 +2093,7 @@
     <string name="drawer_open" msgid="132008699936863299">"開啟導覽匣"</string>
     <string name="drawer_close" msgid="3329237203619660131">"關閉導覽匣"</string>
     <string name="dashboard_title" msgid="821911564947991553">"簡介"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"顯示通知"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"鎖定時隱藏敏感通知內容"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"鎖定時顯示所有通知內容"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0e0b16b..7c3dfe3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1096,7 +1096,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"來歷不明的應用程式可能會損害您的平板電腦及個人資料，如因使用這些應用程式導致平板電腦受損或資料遺失，請自行負責。"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"來歷不明的應用程式可能會損害您的手機及個人資料。如因使用這些應用程式導致手機受損或資料遺失，請自行負責。"</string>
     <string name="verify_applications" msgid="2959359554974828518">"驗證應用程式"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"不允許安裝可能造成系統損壞的應用程式，或在安裝前提出警告"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"定期檢查所有應用程式，如發現可能造成危害的應用程式則予以禁止或向您提出警告"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"進階設定"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"啟用更多設定選項"</string>
     <string name="application_info_label" msgid="5736524913065714880">"應用程式資訊"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"語音通話"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"平板電腦閒置"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"用途不明"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"估計過高"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前端使用狀況"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"選取節約耗電量模式"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"應用程式可能會提供省電的設定"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"使用者用電量"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"用途不明的用電量"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"估計過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔除插頭後已過了 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2091,4 +2093,7 @@
     <string name="drawer_open" msgid="132008699936863299">"開啟導覽匣"</string>
     <string name="drawer_close" msgid="3329237203619660131">"關閉導覽匣"</string>
     <string name="dashboard_title" msgid="821911564947991553">"總覽"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"顯示通知"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"鎖定時隱藏敏感通知內容"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"鎖定時顯示所有通知內容"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index e56d49d..b40a60d 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1097,7 +1097,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"I-tablet kanye nemininingo yakho kusengozini yokuthi kuhlaselwe yizinhlelo zokusebenza ezivela kwimithombo eengaziwa. Uyavuma ukuthi uwena wedwa onesibophezelo sanoma yikuphi ukulimala kwe-tablet yakho noma ukulahleka kwemininingo okungabangelwa ukusetshenziswa kwalezi zinhlelo."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Iselula yakho kanye nemininingo yakho uqobo kusengozini yokuhlaselwa yizinhlelo zokusebenza ezivela kwimithombo engaziwa. Uyavuma ukuthi nguwe wedwa onesibophezelo sanoma yikuphi okulimele noma ukulahleka kwemininingo okungab umphumela wokusebenzisa lezi zinhlelo zokusebenza."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Qinisekisa izinhlelo zokusebenza"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"Ungavumeli noma xwayisa ngaphambi kokufakwa kezinhlelo zokusebenza ezingabangela ubungozi"</string>
+    <string name="verify_applications_summary" msgid="2013363344093910880">"Hlola ngokuvamile zonke izinhlelo zokusebenza uphinde ungavumeli noma uxwayise mayelana nalezo ezingabangela ubungozi"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Izilungiselelo ezithuthukisiwe"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Nima amandla izinketho eziphezulu zezilungiselelo"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Ulwazi lohlelo lokusebenza"</string>
@@ -1518,7 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Amakholi ezwi"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Ithebhulethi ayenzi lutho"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Ifoni ayenzi lutho"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Okungabaliwe"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Okubalwe ngaphezulu"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Inani le-CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ingaphambili le-CPU"</string>
@@ -1562,7 +1563,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Khetha imodi yokulondoloza ibhethri"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Uhlelo lokusebenza lunganikeza izilungiselelo ukwehlisa ukusebenzisa ibhetri"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Ibhethri elisetshenziswe umsebenzisi"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Ukusetshenziswa kwamandla okungabalwa"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ukusetshenziswa kwamandla okubalwe ngaphezulu"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> kusukelwa kungaxhunyiwe"</string>
@@ -2094,4 +2096,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Vula ikhabethe lokuzulazula"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Vala ikhabethe lokuzulazula"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Ukubuka konke"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Bonisa izaziso"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Okuqukethwe kwesaziso esinozwelo kuzofihlwa uma kukhiyiwe"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Konke okuqukethwe kwesaziso kuzoboniswa uma kukhiyiwe"</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 2e22d46..6d0cd76 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1229,4 +1229,17 @@
         <item>6</item>
     </string-array>
 
+    <!-- Setting display values for zen mode -->
+    <string-array name="entries_zen_mode">
+        <item>Off</item>
+        <item>Limited interruptions</item>
+        <item>Zero interruptions</item>
+    </string-array>
+
+    <!-- Setting values for zen mode, must match the Settings.Global.ZEN_MODE_ constants -->
+    <string-array name="entryvalues_zen_mode" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 40098f5..352c7a2 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,6 +15,9 @@
 -->
 
 <resources>
+    <color name="background_drawer">@android:color/white</color>
+    <color name="background_drawer_icon">#ffcccccc</color>
+
     <color name="black">#000</color>
     <color name="red">#F00</color>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6366cc5..8b6e671 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1753,6 +1753,10 @@
     <string name="notification_sound_title">Default notification sound</string>
     <!-- Sound settings screen, notification light repeat pulsing title -->
     <string name="notification_pulse_title">Pulse notification light</string>
+    <!-- Display settings screen, notification popups are enabled [CHAR LIMIT=30] -->
+    <string name="heads_up_enabled_title">Heads Up Notifications</string>
+    <!-- Display settings screen, notification popups are explained [CHAR LIMIT=45]-->
+    <string name="heads_up_enabled_summary">Important notifications will pop up</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
     <string name="incoming_call_volume_title">Ringtone</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
@@ -2625,7 +2629,7 @@
     <!-- Applications settings screen, setting check box title. If checked, the system will send package verification requests to package verifiers on the device who will ultimately allow or reject the installation of applications. [CHAR LIMIT=30] -->
     <string name="verify_applications">Verify apps</string>
     <!-- Applications settings screen, setting check box summary. This is the summary for "App Check" checkbox. [CHAR LIMIT=none] -->
-    <string name="verify_applications_summary">Disallow or warn before installation of apps that may cause harm</string>
+    <string name="verify_applications_summary">Regularly check device activity for security problems, and prevent or warn about potential harm.</string>
     <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
     <string name="advanced_settings">Advanced settings</string>
     <!-- Applications settings screen, setting check box summary.  This is the summary for "Advanced settings" checkbox  -->
@@ -3604,7 +3608,7 @@
     <!-- Label for power consumed when Idle -->
     <string name="power_idle" product="default">Phone idle</string>
     <!-- Label for power that we aren't able to account for -->
-    <string name="power_unaccounted">Unaccounted</string>
+    <string name="power_unaccounted">Unknown</string>
     <!-- Label for power that we computed too much for -->
     <string name="power_overcounted">Over-counted</string>
 
@@ -3626,6 +3630,8 @@
     <string name="usage_type_data_send">Mobile packets sent</string>
     <!-- Label for mobile network data received [CHAR LIMIT=32] -->
     <string name="usage_type_data_recv">Mobile packets received</string>
+    <!-- Label for mobile network radio active time [CHAR LIMIT=32] -->
+    <string name="usage_type_radio_active">Mobile radio active</string>
     <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
     <string name="usage_type_data_wifi_send">Wi\u2011Fi packets sent</string>
     <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
@@ -3702,7 +3708,7 @@
     <string name="battery_desc_users">Battery used by user</string>
 
     <!-- [CHAR LIMIT=50] Description for unaccounted power use -->
-    <string name="battery_desc_unaccounted">Unaccounted power use</string>
+    <string name="battery_desc_unaccounted">Unknown power use</string>
     <!-- [CHAR LIMIT=50] Description for over-counted power use -->
     <string name="battery_desc_overcounted">Over-counted power use</string>
     <!-- Representation of a mAh value. [CHAR LIMIT=NONE] -->
@@ -4993,4 +4999,27 @@
     <string name="dashboard_title">Overview</string>
     <string name="dashboard_wip" translatable="false">Overview - work in progress\n\nUse the Drawer on the left to see the settings list</string>
 
+    <!-- Notifications on lockscreen -->
+    <!-- Label for checkbox controlling the contents of notifications shown on
+         the secure lockscreen [CHAR LIMIT=16] -->
+    <string name="lock_screen_notifications">Show notifications</string>
+    <!-- Summary for lock_screen_notifications: sensitive information will be
+         hidden or redacted from notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+    <string name="lock_screen_notifications_summary_off">Sensitive notification contents will be hidden when locked</string>
+    <!-- Summary for lock_screen_notifications: all information will be
+         shown in notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+    <string name="lock_screen_notifications_summary_on">All notification contents will be shown when locked</string>
+
+    <!-- [CHAR LIMIT=30] Sound settings screen, setting option name to change zen mode -->
+    <string name="title_zen_mode">Zen mode</string>
+    <!-- [CHAR LIMIT=30] Sound settings screen, setting option summary displaying the currently selected zen mode -->
+    <string name="summary_zen_mode" translatable="false">%1$s</string>
+    <!-- [CHAR LIMIT=40] Sound settings screen, title of dialog for picking zen mode -->
+    <string name="dialog_title_zen_mode">Zen mode</string>
+    <!-- [CHAR LIMIT=30] Sound settings screen, description for configuring zen mode -->
+    <string name="configure_zen_mode_description">Configure Zen mode</string>
+    <!-- [CHAR LIMIT=30] Zen mode settings screen, activity title -->
+    <string name="zen_mode_settings_title">Limited Interruptions</string>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index a87ad33..20cb3b4 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -59,7 +59,7 @@
         <item name="wifi_signal">@drawable/wifi_signal_light</item>
     </style>
 
-    <style name="Theme.Settings" parent="@android:style/Theme.Holo">
+    <style name="Theme.Settings" parent="@android:style/Theme.Holo.Light">
         <item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>
         <item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item>
         <item name="@*android:preferenceListStyle">@style/PreferenceHeaderListSinglePane</item>
@@ -70,6 +70,5 @@
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
         <item name="ic_wps">@drawable/ic_wps_dark</item>
         <item name="wifi_signal">@drawable/wifi_signal_dark</item>
-        <item name="android:actionBarStyle">@android:style/Widget.Holo.ActionBar.Solid</item>
     </style>
 </resources>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 666921a..9bbb670 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/accessibility_settings_title">
+        android:title="@string/accessibility_settings">
 
     <PreferenceCategory
             android:key="services_category"
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index 3329662..b49896c 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -22,7 +22,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/applications_settings_header"
+        android:title="@string/applications_settings"
         android:summary="@string/applications_settings_summary"
         android:key="applications_settings">
 
diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml
index e905f39..e4ea1cc 100644
--- a/res/xml/device_info_memory.xml
+++ b/res/xml/device_info_memory.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/storage_settings_title">
+        android:title="@string/storage_settings">
 
 <!-- Preference categories are dynamically created based on the list of available storage volumes -->
 
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index a9506e8..53d9915 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -53,6 +53,12 @@
             android:title="@string/notification_pulse_title"
             android:persistent="false" />
 
+        <CheckBoxPreference
+            android:key="heads_up"
+            android:title="@string/heads_up_enabled_title"
+            android:summary="@string/heads_up_enabled_summary"
+            android:persistent="false" />
+
         <PreferenceScreen
                 android:key="wifi_display"
                 android:title="@string/wifi_display_settings_title"
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 5fcae5c..f6ee594 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/battery_since_unplugged"
+        android:title="@string/power_usage_summary_title"
         android:key="app_list">
     <Preference
         style="?android:attr/preferenceInformationStyle"
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index c2e8ab7..d994922 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -66,6 +66,13 @@
             android:title="@string/nfc_unlock_title"
             android:persistent="false"/>
 
+        <CheckBoxPreference
+            android:key="toggle_lock_screen_notifications"
+            android:title="@string/lock_screen_notifications"
+            android:summaryOff="@string/lock_screen_notifications_summary_off"
+            android:summaryOn="@string/lock_screen_notifications_summary_on"
+            android:persistent="false" />
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index a102efa..20d7644 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -53,6 +53,13 @@
             android:title="@string/nfc_unlock_title"
             android:persistent="false"/>
 
+        <CheckBoxPreference
+            android:key="toggle_lock_screen_notifications"
+            android:title="@string/lock_screen_notifications"
+            android:summaryOff="@string/lock_screen_notifications_summary_off"
+            android:summaryOn="@string/lock_screen_notifications_summary_on"
+            android:persistent="false" />
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 0584e4a..c02df7a 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -57,6 +57,13 @@
             android:title="@string/nfc_unlock_title"
             android:persistent="false"/>
 
+        <CheckBoxPreference
+            android:key="toggle_lock_screen_notifications"
+            android:title="@string/lock_screen_notifications"
+            android:summaryOff="@string/lock_screen_notifications_summary_off"
+            android:summaryOn="@string/lock_screen_notifications_summary_on"
+            android:persistent="false" />
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index 1417e21..2636fa4 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -53,6 +53,13 @@
             android:title="@string/nfc_unlock_title"
             android:persistent="false"/>
 
+        <CheckBoxPreference
+            android:key="toggle_lock_screen_notifications"
+            android:title="@string/lock_screen_notifications"
+            android:summaryOff="@string/lock_screen_notifications_summary_off"
+            android:summaryOn="@string/lock_screen_notifications_summary_on"
+            android:persistent="false" />
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 56c17f9..19cff90 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -62,8 +62,7 @@
         android:id="@+id/wireless_settings"
         android:title="@string/radio_controls_title"
         android:breadCrumbTitle="@string/wireless_networks_settings_title"
-        android:fragment="com.android.settings.WirelessSettings"
-        android:icon="@drawable/empty_icon" />
+        android:fragment="com.android.settings.WirelessSettings" />
 
     <!-- DEVICE -->
     <header android:id="@+id/device_section"
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 26e2e20..580b6d5 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -109,4 +109,13 @@
         android:title="@string/dock_sounds_enable_title"
         android:defaultValue="false" />
 
+    <com.android.settings.ZenModeListPreference
+            android:key="zen_mode"
+            android:persistent="false"
+            android:title="@string/title_zen_mode"
+            android:summary="@string/summary_zen_mode"
+            android:entries="@array/entries_zen_mode"
+            android:entryValues="@array/entryvalues_zen_mode"
+            android:dialogTitle="@string/dialog_title_zen_mode" />
+
 </PreferenceScreen>
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index d984d8f..75e8f61 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -15,6 +15,6 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/wifi_settings_category">
+        android:title="@string/wifi_settings">
 
 </PreferenceScreen>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index c7b9019..474eeb9 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/wireless_networks_settings_title">
+        android:title="@string/radio_controls_title">
 
     <CheckBoxPreference
         android:key="toggle_airplane"
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 90443bdb..396c76a 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -573,11 +573,6 @@
 
         TrafficStats.closeQuietly(mStatsSession);
 
-        if (this.isRemoving()) {
-            getFragmentManager()
-                    .popBackStack(TAG_APP_DETAILS, FragmentManager.POP_BACK_STACK_INCLUSIVE);
-        }
-
         super.onDestroy();
     }
 
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index ab00a0d..06bd3b0 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -25,7 +25,9 @@
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.database.ContentObserver;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.RemoteException;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -51,6 +53,7 @@
     private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
     private static final String KEY_FONT_SIZE = "font_size";
     private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
+    private static final String KEY_HEADS_UP = "heads_up";
     private static final String KEY_SCREEN_SAVER = "screensaver";
 
     private static final int DLG_GLOBAL_CHANGE_WARNING = 1;
@@ -59,14 +62,16 @@
     private CheckBoxPreference mNotificationPulse;
 
     private final Configuration mCurConfig = new Configuration();
+    private final Handler mHandler = new Handler();
 
     private ListPreference mScreenTimeoutPreference;
     private Preference mScreenSaverPreference;
+    private CheckBoxPreference mHeadsUp;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ContentResolver resolver = getActivity().getContentResolver();
+        final ContentResolver resolver = getActivity().getContentResolver();
 
         addPreferencesFromResource(R.xml.display_settings);
 
@@ -102,6 +107,19 @@
                 Log.e(TAG, Settings.System.NOTIFICATION_LIGHT_PULSE + " not found");
             }
         }
+        mHeadsUp = (CheckBoxPreference) findPreference(KEY_HEADS_UP);
+        if (mHeadsUp != null) {
+            updateHeadsUpMode(resolver);
+            mHeadsUp.setOnPreferenceChangeListener(this);
+            resolver.registerContentObserver(
+                    Settings.Global.getUriFor(Settings.Global.HEADS_UP),
+                    false, new ContentObserver(mHandler) {
+                @Override
+                public void onChange(boolean selfChange) {
+                    updateHeadsUpMode(resolver);
+                }
+            });
+        }
     }
 
     private void updateTimeoutPreferenceDescription(long currentTimeout) {
@@ -235,6 +253,16 @@
         }
     }
 
+    private void updateHeadsUpMode(ContentResolver resolver) {
+        mHeadsUp.setChecked(Settings.Global.HEADS_UP_ON == Settings.Global.getInt(resolver,
+                Settings.Global.HEADS_UP, Settings.Global.HEADS_UP_OFF));
+    }
+
+    private void setHeadsUpMode(ContentResolver resolver, boolean value) {
+        Settings.Global.putInt(resolver, Settings.Global.HEADS_UP,
+                value ? Settings.Global.HEADS_UP_ON : Settings.Global.HEADS_UP_OFF);
+    }
+
     public void writeFontSizePreference(Object objValue) {
         try {
             mCurConfig.fontScale = Float.parseFloat(objValue.toString());
@@ -252,6 +280,12 @@
                     value ? 1 : 0);
             return true;
         }
+        if (preference == mHeadsUp) {
+            final boolean value = mHeadsUp.isChecked();
+            Log.d(TAG, "onPreferenceTreeClick mHeadsUp: " + value);
+            setHeadsUpMode(getContentResolver(), value);
+            return true;
+        }
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index f75480b..84a07f2 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -31,7 +31,6 @@
 import android.content.pm.UserInfo;
 import android.nfc.NfcUnlock;
 import android.os.Bundle;
-import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.CheckBoxPreference;
@@ -86,6 +85,7 @@
     private static final String KEY_POWER_INSTANTLY_LOCKS = "power_button_instantly_locks";
     private static final String KEY_CREDENTIALS_MANAGER = "credentials_management";
     private static final String KEY_NOTIFICATION_ACCESS = "manage_notification_access";
+    private static final String KEY_LOCK_SCREEN_NOTIFICATIONS = "toggle_lock_screen_notifications";
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
 
     private PackageManager mPM;
@@ -110,6 +110,7 @@
     private CheckBoxPreference mEnableKeyguardWidgets;
 
     private Preference mNotificationAccess;
+    private CheckBoxPreference mLockscreenNotifications;
 
     private boolean mIsPrimary;
 
@@ -355,9 +356,34 @@
             protectByRestrictions(mResetCredentials);
             protectByRestrictions(root.findPreference(KEY_CREDENTIALS_INSTALL));
         }
+
+        mLockscreenNotifications
+                = (CheckBoxPreference) root.findPreference(KEY_LOCK_SCREEN_NOTIFICATIONS);
+        if (mLockscreenNotifications != null) {
+            if (!getDeviceLockscreenNotificationsEnabled()) {
+                final PreferenceGroup lockscreenCategory =
+                        (PreferenceGroup) root.findPreference(KEY_SECURITY_CATEGORY);
+                if (lockscreenCategory != null) {
+                    lockscreenCategory.removePreference(mLockscreenNotifications);
+                }
+            } else {
+                mLockscreenNotifications.setChecked(getLockscreenAllowPrivateNotifications());
+            }
+        }
+
         return root;
     }
 
+    private boolean getDeviceLockscreenNotificationsEnabled() {
+        return 0 != Settings.Global.getInt(getContentResolver(),
+                Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0);
+    }
+
+    private boolean getLockscreenAllowPrivateNotifications() {
+        return 0 != Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0);
+    }
+
     private int getNumEnabledNotificationListeners() {
         final String flat = Settings.Secure.getString(getContentResolver(),
                 Settings.Secure.ENABLED_NOTIFICATION_LISTENERS);
@@ -591,6 +617,10 @@
         } else if (KEY_TOGGLE_VERIFY_APPLICATIONS.equals(key)) {
             Settings.Global.putInt(getContentResolver(), Settings.Global.PACKAGE_VERIFIER_ENABLE,
                     mToggleVerifyApps.isChecked() ? 1 : 0);
+        } else if (KEY_LOCK_SCREEN_NOTIFICATIONS.equals(key)) {
+            Settings.Secure.putInt(getContentResolver(),
+                    Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
+                    mLockscreenNotifications.isChecked() ? 1 : 0);
         } else {
             // If we didn't handle it, let preferences handle it.
             return super.onPreferenceTreeClick(preferenceScreen, preference);
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 6bcfbee..1c7bb59 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -67,7 +67,6 @@
     public static class RunningServicesActivity extends SettingsActivity { /* empty */ }
     public static class ManageAccountsSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }
-    public static class ChooseAccountActivity extends SettingsActivity { /* empty */ }
     public static class AccountSyncSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccountSyncSettingsInAddAccountActivity extends SettingsActivity { /* empty */ }
     public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ }
@@ -86,6 +85,7 @@
     public static class PaymentSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PrintSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PrintJobSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ZenModeSettingsActivity extends SettingsActivity { /* empty */ }
 
     public static class TopLevelSettings extends SettingsActivity { /* empty */ }
 }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 511fd7d..9524f7d 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -65,6 +65,7 @@
 import android.util.Pair;
 import android.util.TypedValue;
 import android.util.Xml;
+import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -86,7 +87,6 @@
 import com.android.settings.accessibility.CaptionPropertiesFragment;
 import com.android.settings.accounts.AccountSyncSettings;
 import com.android.settings.accounts.AuthenticatorHelper;
-import com.android.settings.accounts.ChooseAccountFragment;
 import com.android.settings.accounts.ManageAccountsSettings;
 import com.android.settings.applications.ManageApplications;
 import com.android.settings.applications.ProcessStatsUi;
@@ -226,7 +226,8 @@
             R.id.accessibility_settings,
             R.id.print_settings,
             R.id.nfc_payment_settings,
-            R.id.home_settings
+            R.id.home_settings,
+            R.id.dashboard
     };
 
     private static final String[] ENTRY_FRAGMENTS = {
@@ -277,8 +278,8 @@
             TrustedCredentialsSettings.class.getName(),
             PaymentSettings.class.getName(),
             KeyboardLayoutPickerFragment.class.getName(),
-            ChooseAccountFragment.class.getName(),
-            DashboardSummary.class.getName()
+            DashboardSummary.class.getName(),
+            ZenModeSettings.class.getName()
     };
 
     private SharedPreferences mDevelopmentPreferences;
@@ -520,6 +521,7 @@
 
         DevicePolicyManager dpm =
                 (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+
         mHeaderAdapter= new HeaderAdapter(this, getHeaders(), mAuthenticatorHelper, dpm);
 
         mDevelopmentPreferences = getSharedPreferences(DevelopmentSettings.PREF_FILE,
@@ -788,8 +790,10 @@
             return;
         }
         if (header != null && mCurrentHeader != null && header.id == mCurrentHeader.id &&
-                header.id != R.id.account_add) {
-            // This is the header we are currently displaying (except "Add Account"). Just make sure
+                header.id != R.id.account_add &&
+                !header.fragment.equals(ManageAccountsSettings.class.getName())) {
+            // This is the header we are currently displaying (except "Add Account" or
+            // "Corporate"/"Google" Account entries that share the same fragment). Just make sure
             // to pop the stack up to its root state.
             getFragmentManager().popBackStack(BACK_STACK_PREFS,
                     FragmentManager.POP_BACK_STACK_INCLUSIVE);
@@ -1437,8 +1441,6 @@
         static int getHeaderType(Header header) {
             if (header.fragment == null && header.intent == null) {
                 return HEADER_TYPE_CATEGORY;
-            } else if (header.id == R.id.wifi_settings || header.id == R.id.bluetooth_settings) {
-                return HEADER_TYPE_SWITCH;
             } else if (header.id == R.id.security_settings) {
                 return HEADER_TYPE_BUTTON;
             } else {
@@ -1536,6 +1538,9 @@
                                 view.findViewById(com.android.internal.R.id.summary);
                         break;
                 }
+                if (holder.mIcon != null) {
+                    holder.mIcon.setBackgroundResource(R.color.background_drawer_icon);
+                }
                 view.setTag(holder);
             } else {
                 view = convertView;
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index d91c11b..35893ff 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -144,7 +144,7 @@
             Log.e(TAG, "Old dialog fragment not null!");
         }
         mDialogFragment = new SettingsDialogFragment(this, dialogId);
-        mDialogFragment.show(getActivity().getFragmentManager(), Integer.toString(dialogId));
+        mDialogFragment.show(getChildFragmentManager(), Integer.toString(dialogId));
     }
 
     public Dialog onCreateDialog(int dialogId) {
@@ -233,17 +233,15 @@
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             if (savedInstanceState != null) {
                 mDialogId = savedInstanceState.getInt(KEY_DIALOG_ID, 0);
+                mParentFragment = getParentFragment();
                 int mParentFragmentId = savedInstanceState.getInt(KEY_PARENT_FRAGMENT_ID, -1);
-                if (mParentFragmentId > -1) {
-                    mParentFragment = getFragmentManager().findFragmentById(mParentFragmentId);
-                    if (!(mParentFragment instanceof DialogCreatable)) {
-                        throw new IllegalArgumentException(
-                                (mParentFragment != null
-                                        ? mParentFragment.getClass().getName()
-                                        : mParentFragmentId)
-                                + " must implement "
-                                + DialogCreatable.class.getName());
-                    }
+                if (!(mParentFragment instanceof DialogCreatable)) {
+                    throw new IllegalArgumentException(
+                            (mParentFragment != null
+                                    ? mParentFragment.getClass().getName()
+                                    : mParentFragmentId)
+                                    + " must implement "
+                                    + DialogCreatable.class.getName());
                 }
                 // This dialog fragment could be created from non-SettingsPreferenceFragment
                 if (mParentFragment instanceof SettingsPreferenceFragment) {
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 28d93f1..d506864 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -75,6 +75,7 @@
     private static final String KEY_DOCK_AUDIO_SETTINGS = "dock_audio";
     private static final String KEY_DOCK_SOUNDS = "dock_sounds";
     private static final String KEY_DOCK_AUDIO_MEDIA_ENABLED = "dock_audio_media_enabled";
+    private static final String KEY_ZEN_MODE = "zen_mode";
 
     private static final String[] NEED_VOICE_CAPABILITY = {
             KEY_RINGTONE, KEY_DTMF_TONE, KEY_CATEGORY_CALLS,
@@ -101,6 +102,7 @@
     private CheckBoxPreference mDockSounds;
     private Intent mDockIntent;
     private CheckBoxPreference mDockAudioMediaEnabled;
+    private ZenModeListPreference mZenModeListPreference;
 
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
@@ -227,6 +229,9 @@
         };
 
         initDockSettings();
+
+        mZenModeListPreference = (ZenModeListPreference) findPreference(KEY_ZEN_MODE);
+        mZenModeListPreference.init();
     }
 
     @Override
diff --git a/src/com/android/settings/ZenModeListPreference.java b/src/com/android/settings/ZenModeListPreference.java
new file mode 100644
index 0000000..e405e0f
--- /dev/null
+++ b/src/com/android/settings/ZenModeListPreference.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+public class ZenModeListPreference extends ListPreference {
+    private static final String TAG = "ZenModeListPreference";
+    private static final boolean DEBUG = false;
+
+    private final Context mContext;
+    private final Handler mHandler = new Handler();
+    private final ContentResolver mResolver;
+
+    private ImageView mConfigure;
+    private int mMode;
+
+    public ZenModeListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        if (DEBUG) Log.d(TAG, "new ZenModeListPreference()");
+        mContext = context;
+        mResolver = context.getContentResolver();
+        setWidgetLayoutResource(R.layout.preference_zen_mode);
+    }
+
+    public void init() {
+        if (DEBUG) Log.d(TAG, "init");
+        loadZenModeSetting("init");
+        setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (DEBUG) Log.d(TAG, "onPreferenceChange " + newValue);
+                final boolean updateWithNewValue = saveZenModeSetting((String)newValue);
+                return updateWithNewValue;
+            }
+        });
+        mResolver.registerContentObserver(
+                Settings.Global.getUriFor(Settings.Global.ZEN_MODE),
+                false, new SettingsObserver());
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        if (DEBUG) Log.d(TAG, "onBindView");
+        super.onBindView(view);
+        mConfigure = (ImageView)view.findViewById(R.id.configure_zen_mode);
+        updateConfigureVisibility();
+        mConfigure.setOnClickListener(new OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                if (mMode != Settings.Global.ZEN_MODE_LIMITED) return;
+                if (mContext instanceof SettingsActivity) {
+                    SettingsActivity sa = (SettingsActivity)mContext;
+                    sa.startPreferencePanel(ZenModeSettings.class.getName(),
+                            null, R.string.zen_mode_settings_title, null, null, 0);
+                }
+            }
+        });
+    }
+
+    private void updateConfigureVisibility() {
+        if (mConfigure != null) {
+            final boolean limited = mMode == Settings.Global.ZEN_MODE_LIMITED;
+            mConfigure.setVisibility(limited ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    private void loadZenModeSetting(String reason) {
+        if (DEBUG) Log.d(TAG, "loadZenModeSetting " + reason);
+        mMode = Settings.Global.getInt(mResolver,
+                Settings.Global.ZEN_MODE, Settings.Global.ZEN_MODE_OFF);
+        setValue(Integer.toString(mMode));
+        updateConfigureVisibility();
+    }
+
+    private boolean saveZenModeSetting(String value) {
+        if (DEBUG) Log.d(TAG, "saveZenModeSetting " + value);
+        try {
+            final int v = Integer.valueOf(value);
+            checkZenMode(v);
+            return Settings.Global.putInt(mResolver, Settings.Global.ZEN_MODE, v);
+        } catch (Throwable t) {
+            Log.w(TAG, "Failed to update zen mode with value: " + value, t);
+            return false;
+        }
+    }
+
+    private static void checkZenMode(int mode) {
+        if (mode < Settings.Global.ZEN_MODE_OFF || mode > Settings.Global.ZEN_MODE_FULL) {
+            throw new IllegalArgumentException("Invalid zen mode: " + mode);
+        }
+    }
+
+    private final class SettingsObserver extends ContentObserver {
+        public SettingsObserver() {
+            super(mHandler);
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            loadZenModeSetting("change");
+        }
+    }
+}
diff --git a/src/com/android/settings/ZenModeSettings.java b/src/com/android/settings/ZenModeSettings.java
new file mode 100644
index 0000000..4b209b5
--- /dev/null
+++ b/src/com/android/settings/ZenModeSettings.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
+import android.widget.ScrollView;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class ZenModeSettings extends SettingsPreferenceFragment {
+    private static final String TAG = "ZenModeSettings";
+    private static final boolean DEBUG = false;
+
+    private ZenModeConfigView mConfig;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final Context context = getActivity();
+        final ScrollView sv = new ScrollView(context);
+        sv.setVerticalScrollBarEnabled(false);
+        sv.setHorizontalScrollBarEnabled(false);
+        mConfig = new ZenModeConfigView(context);
+        sv.addView(mConfig);
+        return sv;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mConfig.resetBackground();
+    }
+
+    public static final class ZenModeConfigView extends LinearLayout {
+        private static final Typeface LIGHT =
+                Typeface.create("sans-serif-light", Typeface.NORMAL);
+        private static final int BG_COLOR = 0xffe7e8e9;
+        private final Context mContext;
+
+        private Drawable mOldBackground;
+        private Toast mToast;
+
+        public ZenModeConfigView(Context context) {
+            super(context);
+            mContext = context;
+            setOrientation(VERTICAL);
+
+            int p = getResources().getDimensionPixelSize(R.dimen.content_margin_left);
+            TextView tv = addHeader("When on");
+            tv.setPadding(0, p / 2, 0, p / 4);
+            addBuckets();
+            tv = addHeader("Automatically turn on");
+            tv.setPadding(0, p / 2, 0, p / 4);
+            addTriggers();
+        }
+
+        @Override
+        protected void onAttachedToWindow() {
+            super.onAttachedToWindow();
+            mOldBackground = getParentView().getBackground();
+            if (DEBUG) Log.d(TAG, "onAttachedToWindow mOldBackground=" + mOldBackground);
+            getParentView().setBackgroundColor(BG_COLOR);
+        }
+
+        public void resetBackground() {
+            if (DEBUG) Log.d(TAG, "resetBackground");
+            getParentView().setBackground(mOldBackground);
+        }
+
+        private View getParentView() {
+            return (View)getParent().getParent();
+        }
+
+        private TextView addHeader(String text) {
+            TextView tv = new TextView(mContext);
+            tv.setTypeface(LIGHT);
+            tv.setTextColor(0x7f000000);
+            tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, tv.getTextSize() * 1.5f);
+            tv.setText(text);
+            addView(tv);
+            return tv;
+        }
+
+        private void addTriggers() {
+            addView(new TriggerView("While driving"));
+            addView(new TriggerView("While in meetings"));
+            addView(new TriggerView("During a set time period"));
+        }
+
+        private void addBuckets() {
+            LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT,
+                    LayoutParams.WRAP_CONTENT);
+            BucketView callView = new BucketView(android.R.drawable.ic_menu_call, "Calls", 2,
+                    "Block all", "Starred contacts only", "Allow all");
+            addView(callView, lp);
+            lp.topMargin = 4;
+            BucketView msgView = new BucketView(android.R.drawable.ic_menu_myplaces,
+                    "Text & SMS Messages", 0,
+                    "Block all", "Starred contacts only", "Allow all");
+            addView(msgView, lp);
+            BucketView alarmView = new BucketView(android.R.drawable.ic_menu_agenda,
+                    "Alarms & Timers", 1,
+                    "Block all", "Allow all");
+            addView(alarmView, lp);
+            BucketView otherView = new BucketView(android.R.drawable.ic_menu_info_details,
+                    "Other Interruptions", 0,
+                    "Block all", "Block all except...");
+            addView(otherView, lp);
+        }
+
+        private void notImplemented() {
+            if (mToast != null) mToast.cancel();
+            mToast = Toast.makeText(mContext, "Not implemented", Toast.LENGTH_SHORT);
+            mToast.show();
+        }
+
+        private class BucketView extends RelativeLayout {
+            private final BucketSpinner mSpinner;
+
+            public BucketView(int icon, String category, int defaultValue, String... values) {
+                super(ZenModeConfigView.this.mContext);
+
+                setBackgroundColor(0xffffffff);
+                final int p = getResources().getDimensionPixelSize(R.dimen.content_margin_left);
+
+                final ImageView iv = new ImageView(mContext);
+                iv.setId(android.R.id.icon);
+                iv.setImageResource(icon);
+                iv.setAlpha(.5f);
+
+                final int size = mContext.getResources()
+                        .getDimensionPixelSize(R.dimen.app_icon_size);
+                LayoutParams lp = new LayoutParams(size, size);
+                lp.addRule(CENTER_VERTICAL);
+                lp.leftMargin = 16;
+                lp.rightMargin = 16;
+                addView(iv, lp);
+
+                TextView tv = new TextView(mContext);
+                tv.setPadding(4, 0, 0, 0);
+                tv.setId(android.R.id.title);
+                tv.setTextColor(0xff000000);
+                tv.setText(category);
+                tv.setAllCaps(true);
+                lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+                lp.addRule(RIGHT_OF, iv.getId());
+                lp.topMargin = p / 2;
+                addView(tv, lp);
+
+                mSpinner = new BucketSpinner(defaultValue, values);
+                lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+                lp.addRule(RIGHT_OF, iv.getId());
+                lp.addRule(BELOW, tv.getId());
+                addView(mSpinner, lp);
+            }
+        }
+
+        private class BucketSpinner extends Spinner {
+            private final Bitmap mArrow;
+
+            public BucketSpinner(int defaultValue, String... values) {
+                super(ZenModeConfigView.this.mContext);
+                setGravity(Gravity.LEFT);
+                mArrow = BitmapFactory.decodeResource(getResources(),
+                        R.drawable.spinner_default_holo_dark_am_no_underline);
+                setPadding(0, 0, getPaddingRight(), getPaddingBottom());
+                setBackgroundColor(0x00000000);
+                final ArrayAdapter<String> adapter = new ArrayAdapter<String>(mContext, 0) {
+                    @Override
+                    public View getView(int position, View convertView,  ViewGroup parent) {
+                        return getDropDownView(position, convertView, parent);
+                    }
+
+                    @Override
+                    public View getDropDownView(int position, View convertView, ViewGroup parent) {
+                        final TextView tv = convertView != null ? (TextView) convertView
+                                : new TextView(ZenModeConfigView.this.mContext);
+                        tv.setText(getItem(position));
+                        if (convertView == null) {
+                            tv.setTypeface(LIGHT);
+                            tv.setGravity(Gravity.LEFT | Gravity.CENTER_VERTICAL);
+                            tv.setTextColor(0xff000000);
+                            tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, tv.getTextSize() * 1.5f);
+                            final int p = (int) tv.getTextSize() / 2;
+                            if (parent instanceof ListView) {
+                                final ListView lv = (ListView)parent;
+                                lv.setDividerHeight(0);
+                                tv.setBackgroundColor(BG_COLOR);
+                                tv.setPadding(p, p, p, p);
+                            } else {
+                                tv.setPadding(0, 0, p, 0);
+                            }
+                        }
+                        return tv;
+                    }
+                };
+                adapter.addAll(values);
+                setAdapter(adapter);
+                setSelection(defaultValue, true);
+            }
+
+            @Override
+            protected void onDraw(Canvas canvas) {
+                final TextView tv = (TextView)getSelectedView();
+                final int w = (int)tv.getLayout().getLineWidth(0);
+                final int left = w - mArrow.getWidth() / 4;
+                final int top = getHeight() - mArrow.getHeight();
+                canvas.drawBitmap(mArrow, left, top, null);
+                super.onDraw(canvas);
+            }
+
+            @Override
+            public void setSelection(int position) {
+                if (position != getSelectedItemPosition()) {
+                    notImplemented();
+                }
+            }
+        }
+
+        private class TriggerView extends RelativeLayout {
+            public TriggerView(String text) {
+                super(ZenModeConfigView.this.mContext);
+
+                setBackgroundColor(0xffffffff);
+                final int p = getResources().getDimensionPixelSize(R.dimen.content_margin_left);
+                final int p2 = p / 4;
+                setPadding(p2, p2, p2, p2);
+
+                final CheckBox cb = new CheckBox(mContext);
+                cb.setId(android.R.id.checkbox);
+                cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+                    @Override
+                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                        if (isChecked) {
+                            cb.setChecked(false);
+                            notImplemented();
+                        }
+                    }
+                });
+                LayoutParams lp = new LayoutParams(LayoutParams.WRAP_CONTENT,
+                        LayoutParams.WRAP_CONTENT);
+                lp.addRule(ALIGN_PARENT_RIGHT);
+                addView(cb, lp);
+
+                final TextView tv = new TextView(mContext);
+                tv.setText(text);
+                tv.setTypeface(LIGHT);
+                tv.setTextColor(0xff000000);
+                tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, tv.getTextSize() * 1.5f);
+                final int p3 = p / 2;
+                tv.setPadding(p3, 0, p3, 0);
+                lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+                lp.addRule(LEFT_OF, cb.getId());
+                lp.addRule(CENTER_VERTICAL);
+                addView(tv, lp);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index 324c595..49e31cf 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -69,6 +69,7 @@
     private CaptioningManager mCaptioningManager;
     private SubtitleView mPreviewText;
     private View mPreviewWindow;
+    private ToggleSwitch mToggleSwitch;
 
     // Standard options.
     private LocalePreference mLocale;
@@ -124,13 +125,38 @@
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        final boolean enabled = mCaptioningManager.isEnabled();
         mPreviewText = (SubtitleView) view.findViewById(R.id.preview_text);
+        mPreviewText.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
+
+        final Context context = view.getContext();
+        final int padding = context.getResources().getDimensionPixelSize(
+                R.dimen.action_bar_switch_padding);
+        mToggleSwitch = new ToggleSwitch(context);
+        mToggleSwitch.setPaddingRelative(0, 0, padding, 0);
+        mToggleSwitch.setCheckedInternal(enabled);
+
         mPreviewWindow = view.findViewById(R.id.preview_window);
 
-        installActionBarToggleSwitch();
+        getPreferenceScreen().setEnabled(enabled);
+
         refreshPreviewText();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        installActionBarToggleSwitch();
+    }
+
+    @Override
+    public void onPause() {
+        removeActionBarToggleSwitch();
+
+        super.onPause();
+    }
+
     private void refreshPreviewText() {
         final Context context = getActivity();
         if (context == null) {
@@ -176,39 +202,41 @@
         }
     }
 
-    private void installActionBarToggleSwitch() {
-        final Activity activity = getActivity();
-        final ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
-
-        final int padding = getResources().getDimensionPixelSize(
-                R.dimen.action_bar_switch_padding);
-        toggleSwitch.setPaddingRelative(0, 0, padding, 0);
-
-        final ActionBar actionBar = activity.getActionBar();
-        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM);
-
-        final ActionBar.LayoutParams params = new ActionBar.LayoutParams(
-                ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.END);
-        actionBar.setCustomView(toggleSwitch, params);
-
-        final boolean enabled = mCaptioningManager.isEnabled();
-        getPreferenceScreen().setEnabled(enabled);
-        mPreviewText.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
-        toggleSwitch.setCheckedInternal(enabled);
-        toggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+    protected void onInstallActionBarToggleSwitch() {
+        mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
             @Override
             public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
                 toggleSwitch.setCheckedInternal(checked);
                 Settings.Secure.putInt(getActivity().getContentResolver(),
                         Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, checked ? 1 : 0);
                 getPreferenceScreen().setEnabled(checked);
-                mPreviewText.setVisibility(checked ? View.VISIBLE : View.INVISIBLE);
+                if (mPreviewText != null) {
+                    mPreviewText.setVisibility(checked ? View.VISIBLE : View.INVISIBLE);
+                }
                 return false;
             }
         });
     }
 
+    private void installActionBarToggleSwitch() {
+        final ActionBar ab = getActivity().getActionBar();
+        final ActionBar.LayoutParams params = new ActionBar.LayoutParams(
+                ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT,
+                        Gravity.CENTER_VERTICAL | Gravity.END);
+        ab.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM);
+        ab.setCustomView(mToggleSwitch, params);
+
+        onInstallActionBarToggleSwitch();
+    }
+
+    private void removeActionBarToggleSwitch() {
+        mToggleSwitch.setOnBeforeCheckedChangeListener(null);
+
+        final ActionBar ab = getActivity().getActionBar();
+        ab.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
+        ab.setCustomView(null);
+    }
+
     private void initializeAllPreferences() {
         mLocale = (LocalePreference) findPreference(PREF_LOCALE);
         mFontSize = (ListPreference) findPreference(PREF_FONT_SIZE);
diff --git a/src/com/android/settings/accessibility/EdgeTypePreference.java b/src/com/android/settings/accessibility/EdgeTypePreference.java
index ad71a76..3bff704 100644
--- a/src/com/android/settings/accessibility/EdgeTypePreference.java
+++ b/src/com/android/settings/accessibility/EdgeTypePreference.java
@@ -34,7 +34,7 @@
     private static final int DEFAULT_FOREGROUND_COLOR = Color.WHITE;
     private static final int DEFAULT_BACKGROUND_COLOR = Color.TRANSPARENT;
     private static final int DEFAULT_EDGE_COLOR = Color.BLACK;
-    private static final float DEFAULT_FONT_SIZE = 96f;
+    private static final float DEFAULT_FONT_SIZE = 32f;
 
     public EdgeTypePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -57,7 +57,9 @@
 
         preview.setForegroundColor(DEFAULT_FOREGROUND_COLOR);
         preview.setBackgroundColor(DEFAULT_BACKGROUND_COLOR);
-        preview.setTextSize(DEFAULT_FONT_SIZE);
+
+        final float density = getContext().getResources().getDisplayMetrics().density;
+        preview.setTextSize(DEFAULT_FONT_SIZE * density);
 
         final int value = getValueAt(index);
         preview.setEdgeType(value);
diff --git a/src/com/android/settings/accessibility/PresetPreference.java b/src/com/android/settings/accessibility/PresetPreference.java
index 84aba6c..9f1aee3 100644
--- a/src/com/android/settings/accessibility/PresetPreference.java
+++ b/src/com/android/settings/accessibility/PresetPreference.java
@@ -27,7 +27,7 @@
 import com.android.settings.R;
 
 public class PresetPreference extends ListDialogPreference {
-    private static final float DEFAULT_FONT_SIZE = 96f;
+    private static final float DEFAULT_FONT_SIZE = 32f;
 
     private final CaptioningManager mCaptioningManager;
 
@@ -54,7 +54,8 @@
         CaptionPropertiesFragment.applyCaptionProperties(
                 mCaptioningManager, previewText, value);
 
-        previewText.setTextSize(DEFAULT_FONT_SIZE);
+        final float density = getContext().getResources().getDisplayMetrics().density;
+        previewText.setTextSize(DEFAULT_FONT_SIZE * density);
 
         final CharSequence title = getTitleAt(index);
         if (title != null) {
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index d56e37c..03f9072 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -18,6 +18,7 @@
 
 import android.app.ActionBar;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
@@ -86,15 +87,28 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        onInstallActionBarToggleSwitch();
+
+        final Context context = view.getContext();
+        final int padding = context.getResources().getDimensionPixelSize(
+                R.dimen.action_bar_switch_padding);
+        mToggleSwitch = new ToggleSwitch(context);
+        mToggleSwitch.setPaddingRelative(0, 0, padding, 0);
+
         onProcessArguments(getArguments());
     }
 
     @Override
-    public void onDestroyView() {
-        getActivity().getActionBar().setCustomView(null);
-        mToggleSwitch.setOnBeforeCheckedChangeListener(null);
-        super.onDestroyView();
+    public void onResume() {
+        super.onResume();
+
+        installActionBarToggleSwitch();
+    }
+
+    @Override
+    public void onPause() {
+        removeActionBarToggleSwitch();
+
+        super.onPause();
     }
 
     protected abstract void onPreferenceToggled(String preferenceKey, boolean enabled);
@@ -108,21 +122,26 @@
     }
 
     protected void onInstallActionBarToggleSwitch() {
-        mToggleSwitch = createAndAddActionBarToggleSwitch(getActivity());
+        // Implement this to set a checked listener.
     }
 
-    private ToggleSwitch createAndAddActionBarToggleSwitch(Activity activity) {
-        ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
-        final int padding = activity.getResources().getDimensionPixelSize(
-                R.dimen.action_bar_switch_padding);
-        toggleSwitch.setPaddingRelative(0, 0, padding, 0);
-        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
-                ActionBar.DISPLAY_SHOW_CUSTOM);
-        activity.getActionBar().setCustomView(toggleSwitch,
-                new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT,
-                        ActionBar.LayoutParams.WRAP_CONTENT,
-                                Gravity.CENTER_VERTICAL | Gravity.END));
-        return toggleSwitch;
+    private void installActionBarToggleSwitch() {
+        final ActionBar ab = getActivity().getActionBar();
+        final ActionBar.LayoutParams params = new ActionBar.LayoutParams(
+                ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT,
+                Gravity.CENTER_VERTICAL | Gravity.END);
+        ab.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM);
+        ab.setCustomView(mToggleSwitch, params);
+
+        onInstallActionBarToggleSwitch();
+    }
+
+    private void removeActionBarToggleSwitch() {
+        mToggleSwitch.setOnBeforeCheckedChangeListener(null);
+
+        final ActionBar ab = getActivity().getActionBar();
+        ab.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
+        ab.setCustomView(null);
     }
 
     public void setTitle(String title) {
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index 3f98e59..34b6c8d 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -143,7 +143,7 @@
                 getIntent().getStringArrayExtra(AccountPreferenceBase.AUTHORITIES_FILTER_KEY);
         final String[] accountTypes =
                 getIntent().getStringArrayExtra(AccountPreferenceBase.ACCOUNT_TYPES_FILTER_KEY);
-        final Intent intent = new Intent(this, Settings.ChooseAccountActivity.class);
+        final Intent intent = new Intent(this, ChooseAccountActivity.class);
         if (authorities != null) {
             intent.putExtra(AccountPreferenceBase.AUTHORITIES_FILTER_KEY, authorities);
         }
diff --git a/src/com/android/settings/accounts/ChooseAccountFragment.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
similarity index 91%
rename from src/com/android/settings/accounts/ChooseAccountFragment.java
rename to src/com/android/settings/accounts/ChooseAccountActivity.java
index 292c3dd..631fe47 100644
--- a/src/com/android/settings/accounts/ChooseAccountFragment.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -18,7 +18,6 @@
 
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
-import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -28,12 +27,12 @@
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.Preference;
+import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.util.Log;
 import com.android.internal.util.CharSequences;
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
 import com.google.android.collect.Maps;
 
 import java.util.ArrayList;
@@ -45,9 +44,9 @@
 /**
  * Activity asking a user to select an account to be set up.
  */
-public class ChooseAccountFragment extends SettingsPreferenceFragment {
+public class ChooseAccountActivity extends PreferenceActivity {
 
-    private static final String TAG = "ChooseAccountFragment";
+    private static final String TAG = "ChooseAccountActivity";
     private String[] mAuthorities;
     private PreferenceGroup mAddAccountGroup;
     private final ArrayList<ProviderEntry> mProviderList = new ArrayList<ProviderEntry>();
@@ -77,13 +76,14 @@
     }
 
     @Override
-    public void onCreate(Bundle icicle) {
+    protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
+        setContentView(R.layout.add_account_screen);
         addPreferencesFromResource(R.xml.add_account_settings);
-        mAuthorities = getActivity().getIntent().getStringArrayExtra(
+        mAuthorities = getIntent().getStringArrayExtra(
                 AccountPreferenceBase.AUTHORITIES_FILTER_KEY);
-        String[] accountTypesFilter = getActivity().getIntent().getStringArrayExtra(
+        String[] accountTypesFilter = getIntent().getStringArrayExtra(
                 AccountPreferenceBase.ACCOUNT_TYPES_FILTER_KEY);
         if (accountTypesFilter != null) {
             mAccountTypesFilter = new HashSet<String>();
@@ -100,7 +100,7 @@
      * and update any UI that depends on AuthenticatorDescriptions in onAuthDescriptionsUpdated().
      */
     private void updateAuthDescriptions() {
-        mAuthDescs = AccountManager.get(getActivity()).getAuthenticatorTypes();
+        mAuthDescs = AccountManager.get(this).getAuthenticatorTypes();
         for (int i = 0; i < mAuthDescs.length; i++) {
             mTypeToAuthDescription.put(mAuthDescs[i].type, mAuthDescs[i]);
         }
@@ -148,7 +148,7 @@
             for (ProviderEntry pref : mProviderList) {
                 Drawable drawable = getDrawableForType(pref.type);
                 ProviderPreference p =
-                        new ProviderPreference(getActivity(), pref.type, drawable, pref.name);
+                        new ProviderPreference(this, pref.type, drawable, pref.name);
                 mAddAccountGroup.addPreference(p);
             }
         } else {
@@ -160,7 +160,7 @@
                 }
                 Log.v(TAG, "No providers found for authorities: " + auths);
             }
-            getActivity().setResult(Activity.RESULT_CANCELED);
+            setResult(RESULT_CANCELED);
             finish();
         }
     }
@@ -196,7 +196,7 @@
         if (mTypeToAuthDescription.containsKey(accountType)) {
             try {
                 AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
-                Context authContext = getActivity().createPackageContext(desc.packageName, 0);
+                Context authContext = createPackageContext(desc.packageName, 0);
                 icon = authContext.getResources().getDrawable(desc.iconId);
             } catch (PackageManager.NameNotFoundException e) {
                 // TODO: place holder icon for missing account icons?
@@ -219,7 +219,7 @@
         if (mTypeToAuthDescription.containsKey(accountType)) {
             try {
                 AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
-                Context authContext = getActivity().createPackageContext(desc.packageName, 0);
+                Context authContext = createPackageContext(desc.packageName, 0);
                 label = authContext.getResources().getText(desc.labelId);
             } catch (PackageManager.NameNotFoundException e) {
                 Log.w(TAG, "No label name for account type " + accountType);
@@ -245,7 +245,7 @@
     private void finishWithAccountType(String accountType) {
         Intent intent = new Intent();
         intent.putExtra(AddAccountSettings.EXTRA_SELECTED_ACCOUNT, accountType);
-        getActivity().setResult(Activity.RESULT_OK, intent);
+        setResult(RESULT_OK, intent);
         finish();
     }
 }
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
old mode 100644
new mode 100755
index 722f569..b1145a1
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -576,6 +576,12 @@
     }
 
     @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mSession.release();
+    }
+
+    @Override
     public void onAllSizesComputed() {
     }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index 9b2a3e8..d6f27ef 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -207,8 +207,8 @@
                 return null;
         }
 
-        // Format the message string, then parse HTML style tags
-        String messageText = getString(messageId1, deviceName);
+        // HTML escape deviceName, Format the message string, then parse HTML style tags
+        String messageText = getString(messageId1, Html.escapeHtml(deviceName));
         messageView.setText(Html.fromHtml(messageText));
         messageView2.setText(messageId2);
         mPairingView.setInputType(InputType.TYPE_CLASS_NUMBER);
@@ -220,7 +220,8 @@
 
     private View createView(CachedBluetoothDeviceManager deviceManager) {
         View view = getLayoutInflater().inflate(R.layout.bluetooth_pin_confirm, null);
-        String name = deviceManager.getName(mDevice);
+	// Escape device name to avoid HTML injection.
+        String name = Html.escapeHtml(deviceManager.getName(mDevice));
         TextView messageView = (TextView) view.findViewById(R.id.message);
 
         String messageText; // formatted string containing HTML style tags
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
index 838e7b1..ea36fee 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
@@ -103,6 +103,19 @@
             NotificationManager manager = (NotificationManager) context
                     .getSystemService(Context.NOTIFICATION_SERVICE);
             manager.cancel(NOTIFICATION_ID);
+
+        } else if (BluetoothDevice.ACTION_BOND_STATE_CHANGED.equals(action)) {
+            int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
+                    BluetoothDevice.ERROR);
+            int oldState = intent.getIntExtra(BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE,
+                    BluetoothDevice.ERROR);
+            if((oldState == BluetoothDevice.BOND_BONDING) &&
+                    (bondState == BluetoothDevice.BOND_NONE)) {
+                // Remove the notification
+                NotificationManager manager = (NotificationManager) context
+                    .getSystemService(Context.NOTIFICATION_SERVICE);
+                manager.cancel(NOTIFICATION_ID);
+            }
         }
     }
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index a1e7278..518fc0e 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -116,6 +116,7 @@
                     R.string.usage_type_wifi_running,
                     R.string.usage_type_data_recv,
                     R.string.usage_type_data_send,
+                    R.string.usage_type_radio_active,
                     R.string.usage_type_data_wifi_recv,
                     R.string.usage_type_data_wifi_send,
                     R.string.usage_type_audio,
@@ -129,6 +130,7 @@
                     entry.sipper.wifiRunningTime,
                     entry.sipper.mobileRxPackets,
                     entry.sipper.mobileTxPackets,
+                    entry.sipper.mobileActive,
                     entry.sipper.wifiRxPackets,
                     entry.sipper.wifiTxPackets,
                     0,
@@ -157,11 +159,13 @@
             {
                 types = new int[] {
                     R.string.usage_type_on_time,
-                    R.string.usage_type_no_coverage
+                    R.string.usage_type_no_coverage,
+                    R.string.usage_type_radio_active,
                 };
                 values = new double[] {
                     entry.sipper.usageTime,
-                    entry.sipper.noCoveragePercent
+                    entry.sipper.noCoveragePercent,
+                    entry.sipper.mobileActive
                 };
             }
             break;
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index bb5ac7a..25ec1fd 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -158,12 +158,22 @@
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == VOICE_DATA_INTEGRITY_CHECK) {
-            mVoiceDataDetails = data;
-            updateVoiceDetails();
+            if (resultCode == TextToSpeech.Engine.CHECK_VOICE_DATA_PASS) {
+                updateVoiceDetails(data);
+            } else {
+                Log.e(TAG, "CheckVoiceData activity failed");
+            }
         }
     }
 
-    private void updateVoiceDetails() {
+    private void updateVoiceDetails(Intent data) {
+        if (data == null){
+            Log.e(TAG, "Engine failed voice data integrity check (null return)" +
+                    mTts.getCurrentEngine());
+            return;
+        }
+        mVoiceDataDetails = data;
+
         if (DBG) Log.d(TAG, "Parsing voice data details, data: " + mVoiceDataDetails.toUri(0));
 
         final ArrayList<String> available = mVoiceDataDetails.getStringArrayListExtra(