Merge "Update notification settings to match Notification Dot branding." into oc-dev

commit: ed8b39fe60d84a3f7021c7e59f91d6623f1be36b [log] [tgz]
author: TreeHugger Robot <treehugger-gerrit@google.com> Thu May 25 20:06:27 2017 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Thu May 25 20:06:28 2017 +0000
tree: 33981b17f1481dde3825be74b48567949f865d33
parent: 1a8c2dd899787d12b7f9e1b2485d3c1164a20f9e [diff]
parent: 5fe7b7985c97fbbd6e827ef1ea2d494676f147be [diff]
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 705e49e..567d7ec 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> lank gebruik"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> gebruik deur <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> van algehele batterygebruik"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ontleding sedert battery laas volgelaai is"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Speletjies"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ander programme"</string>
     <string name="storage_files" msgid="8581083146777364063">"Lêers"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tabletberging"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Foonberging"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Gebruik van <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"gebruik"</string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9ed45af..b5b1ce8 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ከመጠን በላይ የተቆጠረ የሃይል አጠቃቀም"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"ለ<xliff:g id="TIME">^1</xliff:g> ጥቅም ላይ ውሏል"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> ተጠቅሟል"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ከጠቅላላ ባትሪ"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"መጨረሻ ላይ ሙሉ ኃይል ከነበረበት ጊዜ ጀምሮ ያለው ትንታኔ"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"ጨዋታዎች"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ሌሎች መተግበሪያዎች"</string>
     <string name="storage_files" msgid="8581083146777364063">"ፋይሎች"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"የጡባዊ ማከማቻ"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"የስልክ ማከማቻ"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"ከ<xliff:g id="TOTAL">%1$s</xliff:g> ጥቅም ላይ የዋለው"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"ጥቅም ላይ ውሏል"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 95321a0..3dd7553 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -2089,6 +2089,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"استخدام زائد عن الحد للطاقة"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> مللي أمبير في الساعة"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"تم استخدامه لمدة <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> مستخدمة بواسطة <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> من إجمالي شحن البطارية"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"تفاصيل الاستخدام منذ آخر شحن كامل"</string>
@@ -3771,8 +3773,6 @@
     <string name="storage_games" msgid="7703159201697117621">"الألعاب"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"تطبيقات أخرى"</string>
     <string name="storage_files" msgid="8581083146777364063">"الملفات"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"سعة تخزين الجهاز اللوحي"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"سعة تخزين الهاتف"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"سعة تخزين مستخدمة من <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"مستخدمة"</string>

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 8b271af..5eec8ff 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Artıq hesablanmış enerji istifadəsi"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> üçün istifadə olundu"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> batareya istifadə etdi"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> batareya istifadəsi"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Sonuncu tam doldurmadan sonrakı istifadə problemi"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Oyunlar"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Digər tətbiqlər"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fayllar"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Planşet yaddaşı"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefon yaddaşı"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> istifadə olunub"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"işlənib"</string>

diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index f6d7562..29f79b3 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml

@@ -2026,6 +2026,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekomerno izračunata potrošnja energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Koristi se <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> koristi <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupnog kapaciteta baterije"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pregled od poslednjeg potpunog punjenja"</string>
@@ -3618,8 +3620,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Memorija tableta"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Memorija telefona"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Iskorišćeno od ukupno <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"u upot."</string>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 692f78d..47289ee 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -2048,6 +2048,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Няўлічанае спажыванне энергіі"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАг"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Выкарыстана на працягу <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> выкарыстана праграмай <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ад усяго зараду"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Разбіўка з моманту апошняй поўнай зарадкі"</string>
@@ -3671,8 +3673,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Гульні"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Іншыя праграмы"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлы"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Сховішча планшэта"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Сховішча тэлефона"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Выкарыстана з <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"занята"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3708013..7d765c2 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Отчетено в повече захранване"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАч"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Използвано за <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"Използван капацитет от <xliff:g id="APP">%2$s</xliff:g>: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> от общия капацитет на батерията"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Разбивка след последното пълно зареждане"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Игри"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Други приложения"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлове"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Хранилище на таблета"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Хранилище на телефона"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"използвани от <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"ползв."</string>

diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index d36f152..d367206 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"নির্ধারিত শক্তির থেকে বেশী শক্তির ব্যবহার"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> এর জন্য ব্যবহার করা হয়েছে"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> এর দ্বারা <xliff:g id="PERCENT">%1$s</xliff:g> ব্যবহার করা হয়েছে"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"সামগ্রিক ব্যাটারির <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"শেষবার সম্পূর্ণ চার্জ দেওয়ার পর থেকে ব্যাটারির ব্যবহার"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"গেম্স"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"অন্যান্য অ্যাপ্লিকেশান"</string>
     <string name="storage_files" msgid="8581083146777364063">"ফাইল"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ট্যাবলেটের সঞ্চয়স্থান"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ফোনের সঞ্চয়স্থান"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> এর মধ্যে ব্যবহার হয়েছে"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"ব্যবহৃত"</string>

diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index e48441f..d4798f3 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml

@@ -2032,6 +2032,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekoračenje potrošnje energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Korišteno <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"Aplikacija <xliff:g id="APP">%2$s</xliff:g> koristi <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupne baterije"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pregled od posljednje potpune napunjenosti"</string>
@@ -2696,7 +2698,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, emitiranje, NFC"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obavještenja"</string>
-    <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Dopuštenja, zadane aplikacije"</string>
+    <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Odobrenja, zadane aplikacije"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Korisnici i računi"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Zadane aplikacije"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Jezici, vrijeme, sigurnosna kopija, ažuriranja"</string>
@@ -3061,9 +3063,9 @@
     <string name="notification_summary_level" msgid="2726571692704140826">"Nivo %d"</string>
     <string name="notification_summary_channel" msgid="5831124672372023524">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljena dozvola</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljene dozvole</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljenih dozvola</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljeno odobrenje</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljena odobrenja</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljenih odobrenja</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
       <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g> odobrenja je dato</item>
@@ -3071,12 +3073,12 @@
       <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g> odobrenja je dato</item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="931276038884210752">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dodatna dozvola</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dodatne dozvole</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dodatnih dozvola</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dodatno odobrenje</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dodatna odobrenje</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dodatnih odobrenja</item>
     </plurals>
-    <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nema dodijeljenih dozvola"</string>
-    <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nema zatraženih dozvola"</string>
+    <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nema dodijeljenih odobrenja"</string>
+    <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nema zatraženih odobrenja"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Sve aplikacije"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"Instalirane aplikacije"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"Instant-aplikacije"</string>
@@ -3235,15 +3237,15 @@
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr slušalac virtuelne realnosti stereo pomoćna usluga"</string>
     <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistem upozorenje prozor dijaloški okvir prikazivanje preko drugih aplikacija"</string>
     <string name="overlay_settings" msgid="6930854109449524280">"Prikaz preko drugih aplikacija"</string>
-    <string name="system_alert_window_summary" msgid="602892301318324492">"Aplikacije s dozvolom za prikaz preko drugih aplikacija: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije s dozvolom"</string>
+    <string name="system_alert_window_summary" msgid="602892301318324492">"Aplikacije s odobrenjem za prikaz preko drugih aplikacija: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
+    <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije s odobrenjem"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Da"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Ne"</string>
     <string name="install_other_apps" msgid="6986686991775883017">"Instaliranje nepoznatih aplikacija"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instaliranje aplikacije nepoznati izvori"</string>
     <string name="write_settings" msgid="4797457275727195681">"Izmjena postavki sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"pisati izmijeniti sistemske postavke"</string>
-    <string name="write_settings_summary" msgid="4302268998611412696">"Aplikacije sa dozvolom za mijenjanje postavki sistema: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
+    <string name="write_settings_summary" msgid="4302268998611412696">"Aplikacije sa odobrenjem za mijenjanje postavki sistema: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"Mogu instalirati druge aplikacije"</string>
     <string name="filter_write_settings_apps" msgid="2914615026197322551">"Mogu mijenjati postavke sistema"</string>
     <string name="write_settings_title" msgid="4232152481902542284">"Mogu mijenjati postavke sistema"</string>
@@ -3574,8 +3576,8 @@
       <item quantity="other">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"Odobrenja za lokacije"</string>
-    <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"Dopuštenja za mikrofon"</string>
-    <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"Dopuštenja za kameru"</string>
+    <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"Odobrenja za mikrofon"</string>
+    <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"Odobrenja za kameru"</string>
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"Zadane aplikacije"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
@@ -3632,8 +3634,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fajlovi"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Pohrana na tabletu"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Pohrana na telefonu"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Iskorišteno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"iskor."</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 84db437..bd81a0d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"En ús durant <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilitzat per <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> d\'ús de la bateria"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglossament des de l\'última càrrega completa"</string>
@@ -2777,7 +2779,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificacions"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avançada"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificacions de la feina"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Permet les insígnies d\'icona"</string>
+    <string name="notification_badging_title" msgid="5125022693565388760">"Permet icones encerclades"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Llum intermitent"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"A la pantalla de bloqueig"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tot el contingut de les notificacions"</string>
@@ -2859,7 +2861,7 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"No mostris mai aquestes notificacions"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostra notificacions"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"No mostris mai notificacions a l\'àrea de notificacions ni en dispositius perifèrics"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Permet el símbol de la icona"</string>
+    <string name="notification_badge_title" msgid="7734903868300369178">"Permet icones encerclades"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Fes prioritària"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permet que aquestes notificacions continuïn interrompent quan el mode No molestis estigui configurat com a Només amb prioritat"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"A la pantalla de bloqueig"</string>
@@ -3484,7 +3486,7 @@
     <string name="web_action_enable_title" msgid="4051513950976670853">"Aplicacions instantànies"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Obre enllaços en aplicacions, encara que no estiguin instal·lades"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"Aplicacions instantànies"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Compte d\'aplicacions instantànies"</string>
+    <string name="instant_apps_account" msgid="1433620209791992528">"Compte per a les aplicacions instantànies"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicacions instal·lades"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ara mateix, el gestor d\'emmagatzematge gestiona el teu emmagatzematge"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Comptes de l\'usuari <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Jocs"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Altres aplicacions"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fitxers"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Emmagatzematge tauleta"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Emmagatzematge del telèfon"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Utilitzat de: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"utilitzat"</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f5f1d41..f4f1d73 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -2047,6 +2047,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Využíváno <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> bylo použito aplikací <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> z celkové kapacity baterie"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Přehled od posledního úplného nabití"</string>
@@ -3669,8 +3671,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Hry"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Další aplikace"</string>
     <string name="storage_files" msgid="8581083146777364063">"Soubory"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Úložiště tabletu"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Úložiště telefonu"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Využito z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"využito"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5cab08b..b64255a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -1617,7 +1617,7 @@
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Aldrig brugt)"</string>
     <string name="no_default_apps" msgid="2915315663141025400">"Ingen standardapps."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Lagerforbrug"</string>
-    <string name="storageuse_settings_summary" msgid="3748286507165697834">"Vis lagerplads, der bruges af apps"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"Vis lagerplads, der anvendes af apps"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Genstarter"</string>
     <string name="cached" msgid="1059590879740175019">"Cachelagret baggrundsproces"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Intet kører."</string>
@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Har været aktiv i <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> anvendt af <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> af det samlede batteriforbrug"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Siden sidste fulde opladning"</string>
@@ -3000,7 +3002,7 @@
     <string name="storage_type_external" msgid="7738894330670001898">"Ekstern lagerplads"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"Appens dataforbrug"</string>
     <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> brugt siden <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="storage_used" msgid="7128074132917008743">"Brugt lagerplads"</string>
+    <string name="storage_used" msgid="7128074132917008743">"Anvendt lagerplads"</string>
     <string name="change" msgid="6657848623929839991">"Skift"</string>
     <string name="change_storage" msgid="600475265207060436">"Skift lager"</string>
     <string name="notifications_label" msgid="8543457911148619898">"Appunderretninger"</string>
@@ -3236,7 +3238,7 @@
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps er installeret"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"Der er installeret 24 apps"</string>
     <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> er brugt – <xliff:g id="FREE_SPACE">%2$s</xliff:g> ledig plads"</string>
-    <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Intern lagerplads: <xliff:g id="PERCENTAGE">%1$s</xliff:g> er brugt – <xliff:g id="FREE_SPACE">%2$s</xliff:g> ledig plads"</string>
+    <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Intern lagerplads: <xliff:g id="PERCENTAGE">%1$s</xliff:g> er anvendt – <xliff:g id="FREE_SPACE">%2$s</xliff:g> ledig plads"</string>
     <string name="display_summary" msgid="6737806235882127328">"Gå i dvale efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> uden aktivitet"</string>
     <string name="display_dashboard_summary" msgid="4145888780290131488">"Baggrund, dvale, skriftstørrelse"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"Gå i dvale efter 10 minutters inaktivitet"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Spil"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Andre apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Filer"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Din tablets lagerplads"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Lagerplads på telefonen"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Anvendt lagerplads ud af <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"brugt"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a80211b..4c1e519 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Seit <xliff:g id="TIME">^1</xliff:g> verwendet"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> durch <xliff:g id="APP">%2$s</xliff:g> verbraucht"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> des gesamten Akkuverbrauchs"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Verbrauchsdetails seit letzter vollständiger Ladung"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Spiele"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Weitere Apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Dateien"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tablet-Speicher"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefonspeicher"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"von <xliff:g id="TOTAL">%1$s</xliff:g> verwendet"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"belegt"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8203b6e..40c936d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Υπερεκτίμηση χρήσης ισχύος"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Χρησιμοποιείται για <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> χρησιμοποιείται από: <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> της συνολικής μπαταρίας"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ανάλυση από την τελευταία πλήρη φόρτιση"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Παιχνίδια"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Άλλες εφαρμογές"</string>
     <string name="storage_files" msgid="8581083146777364063">"Αρχεία"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Αποθηκ. χώρος tablet"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Αποθηκ. χώρος τηλεφώνου"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Σε χρήση από τα <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"σε χρήση"</string>

diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 6edc218..a13d0da 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Games"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Other apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Files"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tablet storage"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Phone storage"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"used"</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6edc218..a13d0da 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Games"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Other apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Files"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tablet storage"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Phone storage"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"used"</string>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 6edc218..a13d0da 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Games"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Other apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Files"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tablet storage"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Phone storage"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"used"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 437343d..050eff9 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Se usó durante <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> usado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de la batería total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglose desde la última carga completa"</string>
@@ -3565,8 +3567,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Juegos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Otras apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Archivos"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Almacenamiento en tablet"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Almacenamiento del teléfono"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"En uso de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"usado"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e156d2f..30c8c25 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"En uso durante <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> usado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> del total de batería"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglose desde la última carga completa"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Juegos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Otras aplicaciones"</string>
     <string name="storage_files" msgid="8581083146777364063">"Archivos"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Almacenamiento del tablet"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Almacenamiento del teléfono"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Usado de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"usado"</string>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 9ac8b37..d3f4413 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Kasutatud <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> kasutab <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kogu akumahust"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Üksikasjalik teave alates viimasest täislaadimisest"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Mängud"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Muud rakendused"</string>
     <string name="storage_files" msgid="8581083146777364063">"Failid"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tahvelarvuti salvestusruum"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefoni salvestusruum"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Kasutatud <xliff:g id="TOTAL">%1$s</xliff:g>-st"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"kasut."</string>

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index fb96a37..287d173 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uste baino energia gutxiago erabili da."</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Erabilera-denbora: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> erabili du <xliff:g id="APP">%2$s</xliff:g> aplikazioak"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Bateria osoaren <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Guztiz kargatu zenetik emandako erabileraren datuak"</string>
@@ -2074,7 +2076,7 @@
     <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Cachean gordeta"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Ahots-sarrera eta -irteera"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ahots-sarreraren eta -irteeraren ezarpenak"</string>
-    <string name="voice_search_settings_title" msgid="2775469246913196536">"Ahots bidezko bilaketa"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"Ahozko bilaketa"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android teklatua"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Ahots bidezko idazketaren ezarpenak"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Ahots bidezko idazketa"</string>
@@ -3070,7 +3072,7 @@
     <string name="choose_voice_input_title" msgid="975471367067718019">"Aukeratu ahots-idazketa aplik."</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Arakatzailearen aplikazioa"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Ez dago arakatzailerik lehenetsita"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Telefonoaren aplikazioa"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Telefonoa aplikazioa"</string>
     <string name="default_app" msgid="6864503001385843060">"(lehenetsia)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Sistemaren lehenespena)"</string>
@@ -3263,20 +3265,20 @@
     <string name="condition_turn_on" msgid="9089876276117874591">"Aktibatu"</string>
     <string name="condition_expand_show" msgid="608202020023489939">"Erakutsi"</string>
     <string name="condition_expand_hide" msgid="948507739223760667">"Ezkutatu"</string>
-    <string name="condition_hotspot_title" msgid="7778958849468560027">"Hotspot is on"</string>
+    <string name="condition_hotspot_title" msgid="7778958849468560027">"Sare publikoa aktibatuta"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Wi-Fi sare publiko eramangarria (<xliff:g id="ID_1">%1$s</xliff:g>) aktibo dago,  is active, Wi-Fi for this device is turned off."</string>
-    <string name="condition_airplane_title" msgid="287356299107070503">"Hegaldi modua aktibatuta dago"</string>
+    <string name="condition_airplane_title" msgid="287356299107070503">"Hegaldi modua aktibatuta"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"Desaktibatuta daude Wi-Fi, Bluetooth eta telefonia mugikorreko sareak. Ezin izango duzu egin telefono-deirik, ezta Internetera konektatu ere."</string>
-    <string name="condition_zen_title" msgid="2679168532600816392">"Do not disturb is on (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
+    <string name="condition_zen_title" msgid="2679168532600816392">"\"Ez molestatu\" modua aktibatuta (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Bateria-aurrezlea aktibatuta"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"Funtzionamendua mantsotu egin da. Kokapen-zerbitzuak eta atzeko planoko datuak desaktibatu egin dira."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"Datu-konexioa desaktibatuta"</string>
     <string name="condition_cellular_summary" msgid="1818046558419658463">"Wi-Fi bidez soilik erabil daiteke Internet"</string>
-    <string name="condition_bg_data_title" msgid="2483860304802846542">"Aktibatuta dago datu-aurrezlea"</string>
+    <string name="condition_bg_data_title" msgid="2483860304802846542">"Datu-aurrezlea aktibatuta"</string>
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Atzeko planoko datuak Wi-Fi bidez soilik erabil daitezke. Horrek eragina izango du aplikazio eta zerbitzu batzuetan, Wi-Fi konexiorik ez dagoenean."</string>
-    <string name="condition_work_title" msgid="7293722361184366648">"Desaktibatuta dago laneko profila"</string>
+    <string name="condition_work_title" msgid="7293722361184366648">"Laneko profila desaktibatuta"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Desaktibatuta daude aplikazioak, atzeko planoko sinkronizazioa eta laneko profilarekin erlazionatutako bestelako eginbideak."</string>
-    <string name="condition_night_display_title" msgid="5599814941976856183">"Gaueko argia piztuta dago"</string>
+    <string name="condition_night_display_title" msgid="5599814941976856183">"Gaueko argia aktibatuta"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Pantaila tindu horikaraz jantzi dugu. Errazago hartuko zaitu loak horrela."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Iradokizunak"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Jokoak"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Beste aplikazio batzuk"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fitxategiak"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tabletaren memoria"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefonoaren memoria"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Memoria osotik (<xliff:g id="TOTAL">%1$s</xliff:g>) erabilitakoa"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"erabilita"</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a4be204..b6d68da 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"نیروی مصرفی بیش از حد محاسبه شده"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> میلی‌آمپرساعت"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"مدت‌ زمان استفاده <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> از شارژ باتری را مصرف کرده است"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> از کل شارژ باتری"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"تفکیک مصرف شارژ از زمان آخرین شارژ کامل"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"بازی‌ها"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"سایر برنامه‌ها"</string>
     <string name="storage_files" msgid="8581083146777364063">"فایل‌ها"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"حافظه رایانه لوحی"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"حافظه تلفن"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"مصرف‌شده از <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"پر"</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index a8bcdab..d3e381b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Käyttöaika: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> on käyttänyt <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kaikesta virrankulutuksesta"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Erittely edellisen täyden latauksen jälkeen"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Pelit"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Muut sovellukset"</string>
     <string name="storage_files" msgid="8581083146777364063">"Tiedostot"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tabletin tallennustila"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Puhelimen tallennustila"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Tallennustilasta (<xliff:g id="TOTAL">%1$s</xliff:g>) käytössä"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"käyt."</string>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 0db5bd6..643ba34 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Temps d\'utilisation : <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilisé(s) par <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de l\'utilisation totale de la pile"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Répartition depuis la dernière charge complète"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Jeux"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Autres applications"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fichiers"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Stockage sur la tablette"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Stockage du téléphone"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"utilisé(s) sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"utilisé"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2eada5e..37ebc56 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Temps d\'utilisation : <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilisé(s) par <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de la batterie"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Répartition depuis la dernière charge complète"</string>
@@ -2826,12 +2828,12 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Lorsque l\'appareil est en mode Réalité virtuelle"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Réduire le flou (recommandé)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Réduire le scintillement"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Mode PIP"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Aucune application installée n\'est compatible avec le mode PIP"</string>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"Picture-in-picture"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Aucune application installée n\'est compatible avec le mode Picture-in-picture"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in picture"</string>
-    <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Mode PIP"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Autoriser le mode PIP"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Autorisez cette application à créer une fenêtre PIP lorsqu\'elle est ouverte ou après l\'avoir quittée (par exemple, pour continuer de regarder une vidéo). Cette fenêtre se superpose aux autres applications en cours d\'utilisation."</string>
+    <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Autoriser le mode Picture-in-picture"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Autorisez cette application à créer une fenêtre Picture-in-picture lorsqu\'elle est ouverte ou après l\'avoir quittée (par exemple, pour continuer de regarder une vidéo). Cette fenêtre se superpose aux autres applications en cours d\'utilisation."</string>
     <string name="picture_in_picture_on" msgid="6103704909710176555">"Oui"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"Non"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accès \"Ne pas déranger\""</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Jeux"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Autres applications"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fichiers"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Stockage sur la tablette"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Stockage du téléphone"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Utilisés sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"utilisés"</string>

diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index f693ad8..6fbe87c 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Reconto excesivo do uso de enerxía"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Tempo de utilización: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da batería total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Análise detallada desde a última carga completa"</string>
@@ -2826,12 +2828,12 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Cando o dispositivo está no modo de RV"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reducir desenfoque (recomendado)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Reducir escintilación"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Imaxe superposta"</string>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"Pantalla superposta"</string>
     <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Ningunha das aplicacións instaladas é compatible coas imaxes superpostas"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"superposta imaxe"</string>
-    <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Imaxe superposta"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir imaxe superposta"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que esta aplicación cree unha ventá de imaxe superposta mentres que a aplicación está aberta ou despois de saír dela (por exemplo, para continuar visualizando un vídeo). Esta ventá móstrase sobre outras aplicacións que estás utilizando."</string>
+    <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pantalla superposta"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir pantalla superposta"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que esta aplicación cree unha ventá de pantalla superposta mentres que a aplicación está aberta ou despois de saír dela (por exemplo, para continuar visualizando un vídeo). Esta ventá móstrase sobre outras aplicacións que estás utilizando."</string>
     <string name="picture_in_picture_on" msgid="6103704909710176555">"Si"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"Non"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso en modo Non molestar"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Xogos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Outras aplicacións"</string>
     <string name="storage_files" msgid="8581083146777364063">"Ficheiros"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Almacenamento da tableta"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Almacenamento do teléfono"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"En uso de: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"en uso"</string>

diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 5ad7b78..9fe94a8 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"વધુ-ગણાયેલ પાવર ઉપયોગ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> સુધી ઉપયોગ કરાયો"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> દ્વારા <xliff:g id="PERCENT">%1$s</xliff:g> વપરાયું"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"કુલ બૅટરીનું <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"છેલ્લા સંપૂર્ણ ચાર્જ પછીનું વિશ્લેષણ"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"રમતો"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"અન્ય ઍપ્લિકેશનો"</string>
     <string name="storage_files" msgid="8581083146777364063">"ફાઇલો"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ટૅબ્લેટ સ્ટોરેજ"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ફોન સ્ટૉરેજ"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g>માંથી ઉપયોગમાં લેવાયો"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"વપરાયો"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index de0bd29..253b10b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -353,9 +353,9 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"फ़िंगरप्रिंट से अनलॉक"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"फ़िंगरप्रिंट का उपयोग करें"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"अपना फ़ोन अनलॉक करने, खरीदारियां अधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर स्पर्श करें. इस बारे में सावधानी रखें कि आप किसके फ़िंगरप्रिंट जोड रहे हैं. यहां तक एक जोड़ा गया प्रिंट भी इनमें से कोई भी कार्य कर सकता है.\n\nनोट: आपका फ़िंगरप्रिंट किसी सशक्त पैटर्न या पिन से कम सुरक्षित हो सकता है."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"खरीदारियां अधिकृत करने या ऐप्लिकेशन मेंं प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर को स्पर्श करें. इस बारे में सावधानी रखें कि आप किसके फ़िंगरप्रिंट जोड़ रहे हैं. जोड़े गए एक प्रिंट से भी इनमें से कोई भी कार्य किया जा सकता है.\n\nनोट: आप इस डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग नहीं कर सकते हैं. अधिक जानकारी के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"अपना फ़ोन अनलॉक करने, खरीदारियां अधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर स्पर्श करें. इस बारे में सावधानी रखें कि आप किसके फ़िंगरप्रिंट जोड़ रहे हैं. आपके द्वारा जोड़ा गया एक प्रिंट भी इनमें से कोई भी कार्य कर सकता है.\n\nनोट: आपका फ़िंगरप्रिंट किसी सशक्त पैटर्न या पिन से कम सुरक्षित हो सकता है."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"अपने फ़ोन को अनलॉक करने, खरीदारियों को प्राधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर को छूएं. इसमें सावधानी रखें कि आप किस व्यक्ति के फ़िंगरप्रिंट जोड़ रहे हैं. यहां तक कि जोड़े गए एक भी प्रिंट से भी इनमें से कोई चीज़ हो सकती है.\n\nध्यान दें: हो सकता है कि आपका फ़िंगरप्रिंट किसी मज़बूत पैटर्न या पिन से कम सुरक्षित हो."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"खरीदारियों को प्राधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर को छूएं. इसमें सावधानी रखें कि आप किस व्यक्ति के फ़िंगरप्रिंट जोड़ रहे हैं. यहां तक कि जोड़े गए एक भी प्रिंट से भी इनमें से कोई चीज़ हो सकती है.\n\nनोट: आप इस डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग नहीं कर सकते हैं. अधिक जानकारी के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"अपने फ़ोन को अनलॉक करने, खरीदारियों को प्राधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर को छूएं. इसमें सावधानी रखें कि आप किस व्यक्ति के फ़िंगरप्रिंट जोड़ रहे हैं. यहां तक कि जोड़े गए एक भी प्रिंट से भी इनमें से कोई चीज़ हो सकती है.\n\nध्यान दें: हो सकता है कि आपका फ़िंगरप्रिंट किसी मज़बूत पैटर्न या पिन से कम सुरक्षित हो."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"अभी नहीं"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"जारी रखें"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"अभी नहीं"</string>
@@ -368,26 +368,26 @@
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह फ़ोन खो जाता है या चोरी चला जाता है, तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"फिर भी आगे बढ़ें"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"वापस जाएं"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"संवेदक ढूंढें"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"अपने फ़ोन के पीछे फ़िंगरप्रिंट संवेदक का पता लगाएं."</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"डिवाइस और फ़िंगरप्रिंट संवेदक स्‍थान वाला चित्रण"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"सेंसर ढूंढें"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"अपने फ़ोन के पीछे फ़िंगरप्रिंट सेंसर का पता लगाएं."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"डिवाइस और उस पर फ़िंगरप्रिंट सेंसर की जगह बताने वाला चित्रण"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"नाम"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ठीक"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"हटाएं"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"आइए शुरू करें"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"अपनी अंगुली संवेदक पर रखें और कंपन का अनुभव होने पर उठा लें"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"अपनी उंगली सेंसर पर रखें और कंपन का अनुभव होने पर उठा लें"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"जारी रखें"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"अपने फ़िंगरप्रिंट के सभी भिन्न भागों को जोड़ने के लिए अपनी अंगुली को धीरे से हिलाएं"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"अंगुली की छाप जोड़ा है!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जब भी आपको यह आइकन दिखाई दे, आप पहचान के लिए या खरीदारी को अधिकृत करने के लिए अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"अपने डिवाइस को सक्रिय और अनलॉक करने के लिए बस फ़िंगरप्रिंट सेंसर स्पर्श करें."</string>
+    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"अपने डिवाइस को सक्रिय और अनलॉक करने के लिए बस फ़िंगरप्रिंट सेंसर को छूएं."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"यह आइकन दिखाई देने पर, आप खरीदारियां प्राधिकृत कर सकते हैं या ऐप्लिकेशन में प्रवेश भी कर सकते हैं."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फ़िंगरप्रिंट सेटअप छोड़ें?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"आपने अपने फ़ोन को अनलॉक करने के एक तरीके के रूप में अपने फ़िंगरप्रिंट का उपयोग करने का चयन किया है. यदि आप इसे अभी छोड़ते हैं, तो आपको इसे बाद में सेट करना होगा. सेटअप में लगभग एक मिनट लगता है."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्‍क्रीन लॉक सेट करें"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"हो गया"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ओह, वह संवेदक नहीं है"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"डिवाइस पर फ़िंगरप्रिंट संवेदक का उपयोग करें."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ओह, वह सेंसर नहीं है"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"डिवाइस पर फ़िंगरप्रिंट सेंसर का उपयोग करें."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"नामांकन पूर्ण नहीं हुआ था"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"फ़िंगरप्रिंट नामांकन समय की सीमा पार हो गई है. फिर से प्रयास करें."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"फ़िंगरप्रिंट नामांकन ने काम नहीं किया. फिर से प्रयास करें या किसी दूसरी अंगुली का उपयोग करें."</string>
@@ -395,7 +395,7 @@
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"आगे"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"अपना फ़ोन अनलॉक करने के साथ ही, खरीदी और ऐप ऐक्‍सेस को अधिकृत करने के लिए आप अपनी फ़िंगरप्रिंट का भी उपयोग कर सकते हैं. "<annotation id="url">"और जानें"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" स्क्रीन लॉक विकल्प अक्षम है. अधिक जानने के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें. "<annotation id="admin_details">"अधिक विवरण"</annotation>\n\n"आप खरीदारी और ऐप्लिकेशन एक्सेस अधिकृत करने के लिए अभी भी अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं. "<annotation id="url">"अधिक जानें"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"अंगुली उठाएं, फिर सेंसर को पुनः स्पर्श करें"</string>
+    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"उंगली उठाएं और सेंसर को फिर छूएं"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"आप <xliff:g id="COUNT">%d</xliff:g> फ़िंगरप्रिंट तक जोड़ सकते हैं"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"आप अधिकतम संख्या में फ़िंगरप्रिंट जोड़ चुके हैं"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"और अधिक फ़िंगरप्रिंट नहीं जोड़े जा सकते"</string>
@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"पावर का अत्यधिक उपयोग"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> के लिए उपयोग किया गया"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ने <xliff:g id="PERCENT">%1$s</xliff:g> उपयोग किया है"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"पूरी बैटरी का <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"पूरी तरह चार्ज होने के बाद से अब तक का विश्लेषण"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"गेम"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"अन्य ऐप्लिकेशन"</string>
     <string name="storage_files" msgid="8581083146777364063">"फ़ाइलें"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"टैबलेट में जगह"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"फ़ोन की जगह"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> में से उपयोग किया गया"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"उपयोग की गई"</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 919505c..8b66fcd 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -2026,6 +2026,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Upotrebljava se <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> upotrebljava <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupne potrošnje baterije"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Razrada od posljednjeg potpunog punjenja"</string>
@@ -3618,8 +3620,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ostale aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Pohrana tableta"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Pohrana na telefonu"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Upotrijebljeno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"upot."</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index ad7290b..6d64af7 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Használat ideje: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"A(z) <xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g>-ot használt"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Az akkumulátor teljes töltöttségi szintjének <xliff:g id="PERCENT">%1$s</xliff:g>-a"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Statisztikák az utolsó teljes feltöltés óta"</string>
@@ -3569,8 +3571,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Játékok"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Egyéb alkalmazások"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fájlok"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Táblagép tárhelye"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefontárhely"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"A(z) <xliff:g id="TOTAL">%1$s</xliff:g> tárhelyből felhasznált mennyiség"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"foglalt"</string>

diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 01fbecd..13ef3c3 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml

@@ -1020,7 +1020,7 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ավտոմատ պայծառություն"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Բարձրացնել՝ միանալու համար"</string>
     <string name="doze_title" msgid="2259176504273878294">"Քնելու ռեժիմի արգելք"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"Ակտիվացնում է էկրանը ծանուցումներ ստանալու դեպքում"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"Ակտիվացնել էկրանը ծանուցումներ ստանալու դեպքում"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Տառաչափ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Տառաչափի մեծացում կամ փոքրացում"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM քարտի կողպման կարգավորումներ"</string>
@@ -1312,17 +1312,17 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"Խնդրում ենք սպասել..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Զանգի կարգավորումները"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Կարգավորեք ձայնային փոստը, զանգի վերահասցեավորումը, զանգի սպասումը, զանգողի ID-ն"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB միացում"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB մոդեմ"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Դյուրակիր թեժ կետ"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-ը կապվում է"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Միացում"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth մոդեմ"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Մոդեմի ռեժիմ"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"Թեժ կետ և մոդեմի ռեժիմ"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Թեժ կետը և մոդեմի ռեժիմը միացված են"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Թեժ կետ, մոդեմի ռեժիմ"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Թեժ կետը միացված է"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Միացում"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Մոդեմի ռեժիմ"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Երբ թրաֆիկի տնտեսումն ակտիվ է, հնարավոր չէ կապել կամ օգտագործել շարժական հասանելիության կետերը"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB միացում"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB մոդեմ"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB սարքը միացված է, ստուգեք կապը"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Միացված է"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Հնարավոր չէ միանալ, երբ USB կրիչը օգտագործման մեջ է"</string>
@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Մարտկոցի գերօգտագործում"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Օգտագործվել է <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> օգտագործվել է <xliff:g id="APP">%2$s</xliff:g> հավելվածի կողմից"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Մարտկոցի ընդհանուր լիցքի <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Օգտագործումը վերջին լիցքավորումից հետո"</string>
@@ -2741,7 +2743,7 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Նվագարկել միակցիչի բարձրախոսով"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Բոլոր աուդիոֆայլերը"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Միայն մեդիակրիչի աուդիոֆայլերը"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Լուռ"</string>
+    <string name="emergency_tone_silent" msgid="1067515631635824291">"Անձայն"</string>
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Զգուշացում"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Թրթռալ"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Միացման ձայներ"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Խաղեր"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Այլ հավելվածներ"</string>
     <string name="storage_files" msgid="8581083146777364063">"Ֆայլեր"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Պլանշետի հիշողությունը"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Հեռախոսի հիշողություն"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Օգտագործված է <xliff:g id="TOTAL">%1$s</xliff:g>-ից"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"զբաղված է"</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 67b4b2b..b18dbab 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Digunakan selama <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> digunakan oleh <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> dari seluruh penggunaan baterai"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Penggunaan sejak pengisian baterai terakhir hingga penuh"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Game"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Aplikasi lainnya"</string>
     <string name="storage_files" msgid="8581083146777364063">"File"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Penyimpanan tablet"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Penyimpanan ponsel"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Terpakai dari <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"dipakai"</string>

diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 5aa4823..9f79906 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oftalin orkunotkun"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Notað fyrir <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> notuð af <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> af heildarrafhlöðuorku"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Greining frá síðustu fullu hleðslu"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Leikir"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Önnur forrit"</string>
     <string name="storage_files" msgid="8581083146777364063">"Skrár"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Geymsla spjaldtölvu"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Geymslurými símans"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Notað af <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"notuð"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1774bb0..f27dca5 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Usato per <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizzato da <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> dell\'utilizzo totale della batteria"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Analisi dettagliata dall\'ultima ricarica completa"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Giochi"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Altre app"</string>
     <string name="storage_files" msgid="8581083146777364063">"File"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Memoria del tablet"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Memoria telefono"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Spazio utilizzato di <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"usato"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f3f9f99..266387d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -2047,6 +2047,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"חישוב יתר של שימוש בחשמל"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> מיליאמפר לשעה"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"משך השימוש: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> בשימוש על ידי <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> מצריכת הסוללה הכוללת"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"פירוט מאז הטעינה המלאה האחרונה"</string>
@@ -3671,8 +3673,6 @@
     <string name="storage_games" msgid="7703159201697117621">"משחקים"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"אפליקציות אחרות"</string>
     <string name="storage_files" msgid="8581083146777364063">"קבצים"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"אחסון בטאבלט"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"אחסון בטלפון"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"בשימוש מתוך <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"בשימוש"</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e968c5c..ba39303 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"過剰算出された消費電力"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>、使用"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g>: <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"電池使用量全体の <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"前回のフル充電以降の内訳"</string>
@@ -3571,8 +3573,6 @@
     <string name="storage_games" msgid="7703159201697117621">"ゲーム"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"その他のアプリ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ファイル"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"タブレットのストレージ"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"スマートフォン ストレージ"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"/ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"使用"</string>

diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 6d72c71..705abce 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ზედმეტად ჩათვლილი ელკვების გამოყენება"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"გამოიყენება <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g>-ს იყენებს <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ბატარეის საერთო მოხმარების <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"დეტალები ბოლო სრული დატენვიდან"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"თამაშები"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"სხვა აპები"</string>
     <string name="storage_files" msgid="8581083146777364063">"ფაილები"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ტაბლეტის მეხსიერება"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ტელეფონის მეხსიერება"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"გამოყენებულია <xliff:g id="TOTAL">%1$s</xliff:g>-დან"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"გამოყენებული"</string>

diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 49b4387..acdc4b7 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Мөлшерінен жоғары есептелген қуатты қолдану"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> Ампер/сағ"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Пайдаланылу уақыты: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g>-н пайдаланды"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Жалпы батарея зарядының <xliff:g id="PERCENT">%1$s</xliff:g>-ы"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Толық зарядталғаннан кейін пайдаланылғаны"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Ойындар"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Басқа қолданбалар"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлдар"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Планшет жады"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Телефон жады"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Жалпы <xliff:g id="TOTAL">%1$s</xliff:g> жадтан пайдаланылған"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"пайдаланылған"</string>

diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 0a3aed7..3e1e46f 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ការប្រើប្រាស់ថាមពលលើស"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"បានប្រើអស់រយៈពេល <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ប្រើប្រាស់ដោយ <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> នៃថ្មទាំងអស់"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ព័ត៌មានលម្អិតចាប់តាំងពីសាកថ្មពេញលើកចុងក្រោយ"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"ហ្គេម"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"កម្មវិធីផ្សេងទៀត"</string>
     <string name="storage_files" msgid="8581083146777364063">"ឯកសារ"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ទំហំផ្ទុកក្នុងថេប្លេត"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ទំហំផ្ទុកក្នុងទូរសព្ទ"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"បានប្រើនៃ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"បានប្រើប្រាស់"</string>

diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 97e01ab..ec435b2 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ಅಧಿಕ ಗಣನೆಯ ಪವರ್ ಬಳಕೆ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ಕಾಲ ಬಳಸಲಾಗಿದೆ"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ಬಳಸುತ್ತಿರುವುದು <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ಒಟ್ಟು ಬ್ಯಾಟರಿಯ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ಕೊನೆಯ ಬಾರಿ ಚಾರ್ಜ್‌ ಆದ ನಂತರದ ಬಳಕೆಯ ವಿವರ"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"ಗೇಮ್‌ಗಳು"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="storage_files" msgid="8581083146777364063">"ಫೈಲ್‌ಗಳು"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ಟ್ಯಾಬ್ಲೆಟ್ ಸಂಗ್ರಹಣೆ"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ಫೋನ್ ಸಂಗ್ರಹಣೆ"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> ನಲ್ಲಿ ಬಳಸಿರುವುದು"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"ಬಳಕೆಯಾಗಿದೆ"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 82b42a8..e68ebfc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"전력 사용량 과다 산정됨"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> 사용됨"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>에서 <xliff:g id="PERCENT">%1$s</xliff:g> 사용"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"전체 배터리 사용량의 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"마지막 충전 완료 후 사용 내역 분석"</string>
@@ -3030,7 +3032,7 @@
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"요청한 권한이 없습니다."</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"모든 앱"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"설치된 앱"</string>
-    <string name="filter_instant_apps" msgid="574277769963965565">"빠른 실행 앱"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"인스턴트 앱"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"개인"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"직장"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"앱: 전체"</string>
@@ -3481,10 +3483,10 @@
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"인터넷에 연결하거나 이동통신사에 문의하세요."</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"특정 이동통신사만 사용하도록 잠긴 기기에서 사용할 수 없음"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"사용 가능한 전체 크기: <xliff:g id="SIZE">%1$s</xliff:g>\n\n마지막 실행일: <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="web_action_enable_title" msgid="4051513950976670853">"빠른 실행 앱"</string>
+    <string name="web_action_enable_title" msgid="4051513950976670853">"인스턴트 앱"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"앱이 설치되어 있지 않아도 앱에서 링크 열기"</string>
-    <string name="web_action_section_title" msgid="7364647086538399136">"빠른 실행 앱"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"빠른 실행 앱 계정"</string>
+    <string name="web_action_section_title" msgid="7364647086538399136">"인스턴트 앱"</string>
+    <string name="instant_apps_account" msgid="1433620209791992528">"인스턴트 앱 계정"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"설치된 앱"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"현재 저장용량 관리자가 저장용량을 관리하고 있습니다."</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>님의 계정"</string>
@@ -3567,13 +3569,11 @@
     <string name="storage_games" msgid="7703159201697117621">"게임"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"기타 앱"</string>
     <string name="storage_files" msgid="8581083146777364063">"파일"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"태블릿 저장용량"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"휴대전화 저장용량"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>"<xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"/<xliff:g id="TOTAL">%1$s</xliff:g> 사용"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"사용됨"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"앱 삭제"</string>
-    <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"이 빠른 실행 앱을 삭제하시겠습니까?"</string>
+    <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"이 인스턴트 앱을 삭제하시겠습니까?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"게임"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"오디오 파일"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g>님의 경우 제거됨)"</string>
@@ -3586,7 +3586,7 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"저장용량 관리자: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"사용 안함"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"사용"</string>
-    <string name="install_type_instant" msgid="3174425974536078647">"빠른 실행 앱"</string>
+    <string name="install_type_instant" msgid="3174425974536078647">"인스턴트 앱"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"저장용량 관리자를 사용 중지하시겠습니까?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"영화 및 TV 앱"</string>
     <string name="app_info_storage_title" msgid="5554719444625611987">"사용 중인 공간"</string>

diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 7745e5c..b740e8f 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml

@@ -2004,6 +2004,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ашыкча эсептелген кубаттын пайдаланылышы"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> бою колдонулду"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> колдонмосу <xliff:g id="PERCENT">%1$s</xliff:g> сарптады"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Батарея кубатынын <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Толук кубатталгандан бери канчасы колдонулду:"</string>
@@ -3570,8 +3572,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Оюндар"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Башка колдонмолор"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлдар"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Планшеттин сактагычы"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Телефондун сактагычы"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"колдонулду <xliff:g id="TOTAL">%1$s</xliff:g> ичинен"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"колдонулду"</string>

diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index feb30a9..8161876 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ການໃຊ້ພະລັງງານທີ່ຄິດໄລ່ເກີນ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"ໃຊ້ເປັນເວລາ <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ໃຊ້ໄປແລ້ວໂດຍ <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ຂອງແບັດເຕີຣີໂດຍຮວມ"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ວິເຄາະນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"ເກມ"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ແອັບຯອື່ນໆ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ໄຟລ໌"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ບ່ອນຈັດເກັບຂໍ້ມູນແທັບເລັດ"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ບ່ອນຈັດເກັບຂໍ້ມູນໂທລະສັບ"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"ໃຊ້ໄປແລ້ວຈາກ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"ໃຊ້ໄປແລ້ວ"</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0e5fe29..25fca4e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -2047,6 +2047,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Naudojama <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> naudoja „<xliff:g id="APP">%2$s</xliff:g>“"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> visos akumuliatoriaus įkrovos"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Naudojimo nuo paskutinio visiško įkrovimo analizė"</string>
@@ -3669,8 +3671,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Žaidimai"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Kitos programos"</string>
     <string name="storage_files" msgid="8581083146777364063">"Failai"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Planš. komp. saugykla"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefono saugykla"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Naudojama iš <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"naudoj."</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index c1177d2..ec10231 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -2026,6 +2026,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Izmantots šādu laiku: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> izmanto lietotne <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> no vispārējā akumulatora lietojuma"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Sadalījums kopš pēdējās pilnās uzlādes"</string>
@@ -3618,8 +3620,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Spēles"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Citas lietotnes"</string>
     <string name="storage_files" msgid="8581083146777364063">"Faili"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Planšetdatora krātuve"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Tālruņa krātuve"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Izmantoti no <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"izmantots"</string>

diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index ef0a2ec..995f1ce 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Надмината употреба на напојување"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Користење <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> искористени од <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> од целокупната батерија"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Детали по последното целосно полнење"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Игри"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Други апликации"</string>
     <string name="storage_files" msgid="8581083146777364063">"Датотеки"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Меморија на таблетот"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Меморија на телефонот"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Искористено од <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"искор."</string>

diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 5b47d8d..3f2f941 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"കണക്കാക്കിയ പവർ ഉപയോഗം"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> സമയം ഉപയോഗിച്ചു"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ആപ്പ് <xliff:g id="PERCENT">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"മൊത്തം ബാറ്ററിയുടെ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ഫുൾ ചാർജിനുശേഷമുള്ള ഉപയോഗ വിശദാംശങ്ങൾ"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"ഗെയിമുകള്‍"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"മറ്റ് ആപ്‌സ്"</string>
     <string name="storage_files" msgid="8581083146777364063">"ഫയലുകള്‍"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ടാബ്‌ലെറ്റ് സ്റ്റോറേജ്"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ഫോൺ സ്‌റ്റോറേജ്"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"ഉപയോഗിച്ചത്"</string>

diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index cc6b54c..c832627 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Хэтрүүлэн тооцсон цахилгаан ашиглалт"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>-д ашигласан"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g>-г ашигласан"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Бүх батерейны <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Сүүлд бүрэн цэнэглэснээс хойших ашиглалтын мэдээлэл"</string>
@@ -3565,8 +3567,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Тоглоом"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Бусад апп"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файл"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Таблетын сан"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Зургийн сан"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g>-с ашигласан"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"ашигласан"</string>

diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index fe686eb..29f0fa1 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"जास्त प्रमाणात पॉवर वापर"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>साठी वापरले"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ने <xliff:g id="PERCENT">%1$s</xliff:g> वापरले"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"एकूण बॅटरीचे <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"मागच्या वेळेस पूर्ण चार्ज झाल्यापासूनचा ब्रेकडाउन"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"गेम"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"अन्य अॅप्स"</string>
     <string name="storage_files" msgid="8581083146777364063">"फायली"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"टॅबलेट संचय"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"फोन संचय"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small></string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> पैकी वापरले"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"वापरलेली"</string>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 0c0a05a..8424edd 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Digunakan selama <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> digunakan oleh <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> daripada keseluruhan bateri"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pecahan sejak cas penuh terakhir"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Permainan"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Apl lain"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fail"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Storan tablet"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Storan telefon"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Digunakan daripada <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"digunakan"</string>

diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index c94d9b2..9ad76ee 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"အပိုရေတွက်မှု စွမ်းရည် အသုံးပြုမှု"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ကြာ သုံးထားသည်"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ကို <xliff:g id="APP">%2$s</xliff:g> က အသုံးပြုထားသည်"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"စုစုပေါင်း ဘက်ထရီ၏<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"နောက်ဆုံးအကြိမ် အားဖြည့်ပြီးချိန်မှစ၍ ခွဲခြမ်းစိတ်ဖြာချက်"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"ဂိမ်းများ"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"အခြားအက်ပ်များ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ဖိုင်များ"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"တက်ဘလက် သိုလှောင်ခန်း"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ဖုန်း၏ သိုလှောင်ခန်း"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> အနက်မှ အသုံးပြုထားပါသည်"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"သုံးထား"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 7c09058..8c33793 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Brukt i <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> brukt av <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> av total batteribruk"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Oversikt siden sist batteriet var fulladet"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Spill"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Andre apper"</string>
     <string name="storage_files" msgid="8581083146777364063">"Filer"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Lagring på nettbrett"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefonlagring"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"brukt av <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"brukt"</string>

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 23a89e5..8dc4b10 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"बढी गिन्ती गरिएको उर्जा प्रयोग"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> का लागि प्रयोग गरियो"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ले प्रयोग गरेको <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"समग्र ब्याट्रीको <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"पछिल्लो पटक पूर्ण चार्ज भएदेखिको विश्लेषण"</string>
@@ -3569,8 +3571,6 @@
     <string name="storage_games" msgid="7703159201697117621">"खेलहरू"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"अन्य अनुप्रयोगहरू"</string>
     <string name="storage_files" msgid="8581083146777364063">"फाइलहरू"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ट्याब्लेटको भण्डारण"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"फोनको भण्डारण"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> मध्ये प्रयोग भएको"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"प्रयोग भयो"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 461c12b..f55cf14 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> gebruikt"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> gebruikt door <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> van batterij"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Uitsplitsing sinds laatste volledige lading"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Games"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Andere apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Bestanden"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Opslag op tablet"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefoonopslag"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"gebruikt van <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"gebr."</string>

diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 8dd5f70..cbadce2 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ਓਵਰ-ਕਾਉਂਟਿਡ ਪਾਵਰ ਵਰਤੋਂ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ਲਈ ਵਰਤਿਆ ਗਿਆ"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ਵੱਲੋਂ <xliff:g id="PERCENT">%1$s</xliff:g> ਵਰਤੀ ਗਈ"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ਸਮੁੱਚੀ ਬੈਟਰੀ ਦਾ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਦੇ ਵੇਰਵੇ"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"ਗੇਮਾਂ"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ਹੋਰ ਐਪਾਂ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ਫ਼ਾਈਲਾਂ"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ਟੈਬਲੈੱਟ ਸਟੋਰੇਜ"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ਫ਼ੋਨ ਸਟੋਰੇਜ"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> ਵਿੱਚੋਂ ਵਰਤਿਆ"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"ਵਰਤੀ ਗਈ"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1673bad..56fb22d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -2047,6 +2047,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Korzystanie przez <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> zużyte przez: <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> całkowitego zużycia baterii"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Zestawienie od ostatniego pełnego naładowania"</string>
@@ -3669,8 +3671,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Gry"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Inne aplikacje"</string>
     <string name="storage_files" msgid="8581083146777364063">"Pliki"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Pamięć w tablecie"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Pamięć telefonu"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"wykorzystane z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"miejsca"</string>

diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 0256a46..0ac4c68 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml

@@ -1375,7 +1375,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Usar GPS, Wi‑Fi, Bluetooth ou redes móveis para determinar a localização"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Usar Wi-Fi, Bluetooth ou redes móveis para determinar a localização"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar local"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar a localização"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Verificação"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Verificação de Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Melhore a localização permitindo que apps e serviços do sistema detectem redes Wi-Fi a qualquer momento."</string>
@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Usada por <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> de uso por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhamento desde a última carga completa"</string>
@@ -2338,7 +2340,7 @@
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Isto preservará o uso de dados e da bateria, mas será necessário sincronizar manualmente cada conta para obter as informações mais recentes, e você não será informado de novas atualizações."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de redefinição do ciclo de uso"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mês:"</string>
-    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definidas"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definir"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Definir aviso de uso de dados"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Definir limite do uso de dados"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitando uso de dados"</string>
@@ -3334,7 +3336,7 @@
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Adicionar outra impr. digital"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Desbloqueie com um dedo diferente"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativada / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Nunca ativar automaticamente"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Ativar automaticamente com %1$s de bateria"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Otimização de bateria desativada"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Jogos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Outros apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Arquivos"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Armazenamento do tablet"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Armazenamento"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Usados de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"usado"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index c0f29a3..adca992 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -25,8 +25,8 @@
     <string name="dlg_switch" msgid="6243971420240639064">"Alternar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+      <item quantity="one">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="other">Está agora a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passos de se tornar um programador.</item>
-      <item quantity="one">Está agora a <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> passo de se tornar um programador.</item>
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Agora é um programador!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Não é necessário, já é um programador."</string>
@@ -242,8 +242,8 @@
     <string name="locale_remove_menu" msgid="7651301406723638854">"Remover"</string>
     <string name="add_a_language" msgid="2330538812283783022">"Adicionar um idioma"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
+      <item quantity="one">Remove selected languages?</item>
       <item quantity="other">Pretende remover os idiomas selecionados?</item>
-      <item quantity="one">Pretende remover o idioma selecionado?</item>
     </plurals>
     <string name="dlg_remove_locales_message" msgid="1361354927342876114">"O texto será apresentado noutro idioma."</string>
     <string name="dlg_remove_locales_error_title" msgid="2653242337224911425">"Não é possível remover todos os idiomas"</string>
@@ -347,8 +347,8 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Adicionar impressão digital"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueio de ecrã"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints set up</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> impressão digital configurada</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloquear com impr. digital"</string>
@@ -538,28 +538,28 @@
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"Tem de incluir, pelo menos, um dígito"</string>
     <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"Tem de incluir, pelo menos, um símbolo"</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> letters</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras</item>
-      <item quantity="one">Tem de incluir, pelo menos, 1 letra</item>
     </plurals>
     <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2626327674921055486">
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> lowercase letters</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras minúsculas</item>
-      <item quantity="one">Tem de incluir, pelo menos, 1 letra minúscula</item>
     </plurals>
     <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="7860796359913920356">
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> uppercase letters</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras maiúsculas</item>
-      <item quantity="one">Tem de incluir, pelo menos, 1 letra maiúscula</item>
     </plurals>
     <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="1967587658356336828">
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> numerical digits</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> dígitos numéricos</item>
-      <item quantity="one">Tem de incluir, pelo menos, 1 dígito numérico</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> special symbols</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> símbolos especiais</item>
-      <item quantity="one">Tem de incluir, pelo menos, 1 símbolo especial</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-letter characters</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> carateres que não sejam letras</item>
-      <item quantity="one">Tem de incluir, pelo menos, 1 caráter que não seja uma letra</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="942665351220525547">"O admin. do disp. não permite a utilização de uma palavra-passe recente"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Não é permitida uma sequência de dígitos ascendente, descendente ou repetida"</string>
@@ -571,15 +571,15 @@
     <string name="manage_device_admin" msgid="537804979483211453">"Aplicações de administrador do dispositivo"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Sem aplicações ativas"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> active apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações ativas</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicação ativa</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agentes fidedignos"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Para utilizar, defina primeiro um bloqueio de ecrã"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Nenhum"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> active trust agents</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agentes fidedignos ativos</item>
-      <item quantity="one">1 agente fidedigno ativo</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ativar Bluetooth"</string>
@@ -805,8 +805,8 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Redes guardadas"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
+      <item quantity="one">%d networks</item>
       <item quantity="other">%d redes</item>
-      <item quantity="one">1 rede</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Avançada"</string>
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar o Wi‑Fi"</string>
@@ -1056,8 +1056,8 @@
     <string name="sim_preferred_message" msgid="8466930554330635780">"O <xliff:g id="NEW_SIM">%1$s</xliff:g> é o único cartão SIM no dispositivo. Pretende utilizar este cartão SIM para os dados móveis, as chamadas e as mensagens SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN do cartão SIM incorreto. Tem de contactar o seu operador para desbloquear o dispositivo."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+      <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
       <item quantity="other">Código PIN do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas.</item>
-      <item quantity="one">Cód. PIN cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de contactar operador p/ desbloquear disp.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Falha ao introduzir o PIN do cartão SIM!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado do tablet"</string>
@@ -1286,8 +1286,8 @@
     <string name="reset_network_complete_toast" msgid="787829973559541880">"As definições de rede foram repostas"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Repos. dados/fábrica"</string>
     <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
+      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> accounts will be reset</item>
       <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> contas serão repostas</item>
-      <item quantity="one">1 conta será reposta</item>
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"A memória de armazenamento interno e todos os dados serão repostos"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
@@ -1504,8 +1504,8 @@
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Limpar cache"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
+      <item quantity="one">%d items</item>
       <item quantity="other">%d itens</item>
-      <item quantity="one">1 item</item>
     </plurals>
     <string name="clear_uri_btn_text" msgid="8575655132961012158">"Limpar acesso"</string>
     <string name="controls_label" msgid="7611113077086853799">"Controlos"</string>
@@ -1799,24 +1799,24 @@
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar nas Definições rápidas"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Modo de correção"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
+      <item quantity="one">Extremely short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Atraso extremamente curto (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
-      <item quantity="one">Atraso extremamente curto (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_very_short_delay" formatted="false" msgid="5589565607652364932">
+      <item quantity="one">Very short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Atraso muito curto (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
-      <item quantity="one">Atraso muito curto (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_short_delay" formatted="false" msgid="5887754135102768400">
+      <item quantity="one">Short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Atraso curto (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
-      <item quantity="one">Atraso curto (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_long_delay" formatted="false" msgid="6340683412750219405">
+      <item quantity="one">Long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Atraso longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
-      <item quantity="one">Atraso longo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_very_long_delay" formatted="false" msgid="3503199424330634970">
+      <item quantity="one">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Atraso muito longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
-      <item quantity="one">Atraso muito longo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configurações"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Ativado"</string>
@@ -1871,8 +1871,8 @@
     <string name="print_settings" msgid="4742428530112487843">"Impressão"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"Desativado"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> serviços de impressão ativados</item>
-      <item quantity="one">1 serviço de impressão ativado</item>
     </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Utilizada durante <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizado pela aplicação <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhes desde o último carregamento completo"</string>
@@ -2458,21 +2460,21 @@
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"A rede pode ser monitorizada"</string>
     <string name="done_button" msgid="1991471253042622230">"Concluído"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
+      <item quantity="one">Trust or remove certificates</item>
       <item quantity="other">Confiar ou remover os certificados</item>
-      <item quantity="one">Confiar ou remover o certificado</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação no seu dispositivo que pode permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o administrador.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação para o seu perfil de trabalho que pode permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o administrador.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"A sua atividade de rede, incluindo emails, aplicações e Websites seguros, pode ser monitorizada por terceiros.\n\nIsto é possível através de uma credencial fidedigna instalada no seu dispositivo."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
+      <item quantity="one">Check certificates</item>
       <item quantity="other">Verificar certificados</item>
-      <item quantity="one">Verificar certificado</item>
     </plurals>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizadores"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilizadores e perfis"</string>
@@ -2649,8 +2651,8 @@
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"A seleção é necessária"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Definições"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
+      <item quantity="one">Show %d hidden items</item>
       <item quantity="other">Mostrar %d itens ocultos</item>
-      <item quantity="one">Mostrar %d item oculto</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rede e Internet"</string>
     <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, dispositivo móvel, utilização de dados, zona Wi-Fi"</string>
@@ -2747,8 +2749,8 @@
     <string name="boot_sounds_title" msgid="567029107382343709">"Ativar sons"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Nenhuma regra automática ativada"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
+      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> automatic rules turned on</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regras automáticas ativadas</item>
-      <item quantity="one">1 regra automática ativada</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferências de Não incomodar"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade permite apenas"</string>
@@ -2810,8 +2812,8 @@
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"As aplicações não podem ler notificações"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+      <item quantity="one">%d apps can read notifications</item>
       <item quantity="other">%d aplicações conseguem ler notificações</item>
-      <item quantity="one">%d aplicação consegue ler notificações</item>
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"Nenhuma aplicação instalada solicitou acesso a notificações"</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Pretende permitir o acesso a notificações de <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -2845,12 +2847,12 @@
     <string name="app_settings_link" msgid="8894946007543660906">"Definições adicionais na aplicação"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Ativadas para todas as aplicações"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
+      <item quantity="one">Turned off for <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Desativado para <xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
-      <item quantity="one">Desativado para <xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="8028574302599397935">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias eliminadas</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria eliminada</item>
     </plurals>
     <string name="notification_badges" msgid="4468378071033143539">"Balões de notificações"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Ativadas"</string>
@@ -2932,12 +2934,12 @@
     <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"Alterar para alarmes apenas, indefinidamente"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+      <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
       <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> minutos, até às <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
-      <item quantity="one">Alterar para alarmes apenas durante um minuto, até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+      <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
       <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> horas até às <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
-      <item quantity="one">Alterar para alarmes apenas durante uma hora até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Alterar para alarmes apenas, até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para interromper sempre"</string>
@@ -3015,16 +3017,16 @@
     <string name="notification_summary_level" msgid="2726571692704140826">"Nível %d"</string>
     <string name="notification_summary_channel" msgid="5831124672372023524">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizações concedidas</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorização concedida</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> autorizações concedidas</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> autorização concedida</item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="931276038884210752">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> additional permissions</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permissões adicionais</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permissão adicional</item>
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nenhuma permissão concedida"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nenhuma permissão solicitada"</string>
@@ -3052,8 +3054,8 @@
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Abrir <xliff:g id="DOMAIN">%s</xliff:g> e outros URLs"</string>
     <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"Nenhum aplicação abre links compatíveis"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps opening supported links</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações que abrem links compatíveis</item>
-      <item quantity="one">Uma aplicação que abre links compatíveis</item>
     </plurals>
     <string name="app_link_open_always" msgid="2474058700623948148">"Abrir com esta aplicação"</string>
     <string name="app_link_open_ask" msgid="7800878430190575991">"Perguntar sempre"</string>
@@ -3155,8 +3157,8 @@
     <string name="free_memory" msgid="4003936141603549746">"Disponível"</string>
     <string name="memory_usage_apps" msgid="5650192998273294098">"Memória utilizada pelas aplicações"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps used memory in the last <xliff:g id="DURATION_1">%2$s</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicações utilizaram a memória nos(as) últimos(as) <xliff:g id="DURATION_1">%2$s</xliff:g></item>
-      <item quantity="one">1 aplicação utilizou a memória nos(as) últimos(as) <xliff:g id="DURATION_0">%2$s</xliff:g></item>
     </plurals>
     <string name="running_frequency" msgid="6622624669948277693">"Frequência"</string>
     <string name="memory_maximum_usage" msgid="6513785462055278341">"Utilização máxima"</string>
@@ -3229,8 +3231,8 @@
     <string name="disconnected" msgid="4836600637485526329">"Sem ligação"</string>
     <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> dos dados utilizados"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
+      <item quantity="one">Off for <xliff:g id="COUNT">%d</xliff:g> apps</item>
       <item quantity="other">Desativadas para <xliff:g id="COUNT">%d</xliff:g> aplicações</item>
-      <item quantity="one">Desativadas para 1 aplicação</item>
     </plurals>
     <string name="notification_summary_none" msgid="4586376436702610">"Ativadas para todas as aplicações"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> aplicações instaladas"</string>
@@ -3302,8 +3304,8 @@
     <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mensalmente a partir do dia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restrições de rede"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrições</item>
-      <item quantity="one">1 restrição</item>
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"A contagem de dados do operador pode ser diferente da contagem do dispositivo"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> utilizado(s)"</string>
@@ -3315,8 +3317,8 @@
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Outras aplicações incluídas na utilização"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicações autorizadas a utilizar dados sem restrições quando a Poupança de dados está ativada</item>
-      <item quantity="one">1 aplicação autorizada a utilizar dados sem restrições quando a Poupança de dados está ativada</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Poupança de dados"</string>
     <string name="unrestricted_data_saver" msgid="7019858887510062789">"Acesso a dados sem restrições"</string>
@@ -3373,8 +3375,8 @@
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"O objeto de classificação não contém esta chave."</string>
     <string name="special_access" msgid="3458780842491881155">"Acesso especial a aplicações"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações podem utilizar dados sem restrições</item>
-      <item quantity="one">1 aplicação pode utilizar dados sem restrições</item>
     </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Pretende mesmo limpar os dados do utilizador e converter para a encriptação de ficheiros?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Limpar e converter"</string>
@@ -3423,16 +3425,16 @@
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pesquisa de contactos"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir pesquisa de contactos por parte da sua entidade para identificar autores das chamadas e contactos"</string>
     <plurals name="hours" formatted="false" msgid="7020844602875333472">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
-      <item quantity="one">1 hora</item>
     </plurals>
     <plurals name="minutes" formatted="false" msgid="4666832442068789413">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
-      <item quantity="one">1 minuto</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="3876307354560025025">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
-      <item quantity="one">1 segundo</item>
     </plurals>
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo de espera de ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computador"</string>
@@ -3511,16 +3513,16 @@
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"Aplicações instaladas"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7433213592572082606">"O número de aplicações é uma estimativa. Pode não incluir as aplicações instaladas fora da Play Store."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="3005116533873542976">
+      <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
-      <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"Autorizações de acesso à localização"</string>
     <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"Autorizações do microfone"</string>
     <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"Autorizações da câmara"</string>
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"Aplicações predefinidas"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
     </plurals>
     <string name="enterprise_privacy_input_method" msgid="6531350246850814920">"Teclado predefinido"</string>
     <string name="enterprise_privacy_input_method_name" msgid="4941106433683067953">"Definido como <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
@@ -3530,35 +3532,35 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global definido"</string>
     <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciais fidedignas"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
+      <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> certificados da AC</item>
-      <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> certificado da AC</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"O administrador pode bloquear o dispositivo e repor a palavra-passe"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"O administrador pode eliminar todos os dados do dispositivo"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"Tentativas de introdução da palavra-passe falhadas antes da eliminação de todos os dados do dispositivo"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"Tentativas de introdução da palavra-passe falhadas antes da eliminação de todos os dados do perfil de trabalho"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="5279099270351036696">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentativas</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tentativa</item>
     </plurals>
     <string name="do_disclosure_generic" msgid="8653670456990823307">"Este dispositivo é gerido pela sua entidade."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo é gerido por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saiba mais"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="1134677050353971363">
+      <item quantity="one">Camera apps</item>
       <item quantity="other">Aplicações de câmara</item>
-      <item quantity="one">Aplicação de câmara</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="3545972964391065220">"Aplicação de calendário"</string>
     <string name="default_contacts_app_title" msgid="3497370557378660098">"Aplicação de contactos"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
+      <item quantity="one">Email client apps</item>
       <item quantity="other">Aplicações de cliente de email</item>
-      <item quantity="one">Aplicação de cliente de email</item>
     </plurals>
     <string name="default_map_app_title" msgid="7560143381633608567">"Aplicação de mapas"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
+      <item quantity="one">Phone apps</item>
       <item quantity="other">Aplicações de telefone</item>
-      <item quantity="one">Aplicação de telefone</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="4309216198909946380">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Jogos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Outras aplicações"</string>
     <string name="storage_files" msgid="8581083146777364063">"Ficheiros"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Armazenamento do tablet"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Armazenamento telemóvel"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Utilizados de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"utilizado"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0256a46..0ac4c68 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -1375,7 +1375,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Usar GPS, Wi‑Fi, Bluetooth ou redes móveis para determinar a localização"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Usar Wi-Fi, Bluetooth ou redes móveis para determinar a localização"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar local"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar a localização"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Verificação"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Verificação de Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Melhore a localização permitindo que apps e serviços do sistema detectem redes Wi-Fi a qualquer momento."</string>
@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Usada por <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> de uso por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhamento desde a última carga completa"</string>
@@ -2338,7 +2340,7 @@
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Isto preservará o uso de dados e da bateria, mas será necessário sincronizar manualmente cada conta para obter as informações mais recentes, e você não será informado de novas atualizações."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de redefinição do ciclo de uso"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mês:"</string>
-    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definidas"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definir"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Definir aviso de uso de dados"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Definir limite do uso de dados"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitando uso de dados"</string>
@@ -3334,7 +3336,7 @@
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Adicionar outra impr. digital"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Desbloqueie com um dedo diferente"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativada / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Nunca ativar automaticamente"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Ativar automaticamente com %1$s de bateria"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Otimização de bateria desativada"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Jogos"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Outros apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Arquivos"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Armazenamento do tablet"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Armazenamento"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Usados de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"usado"</string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bd8c960..e961bab 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -2026,6 +2026,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Utilizată <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> folosită de <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> din bateria încărcată complet"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detaliere de la ultima încărcare completă"</string>
@@ -3618,8 +3620,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Jocuri"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Alte aplicații"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fișiere"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Spațiu de stocare pe tabletă"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Stocare pe telefon"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Folosit din <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"folosit"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4d833ef..cdfc6aa 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -2047,6 +2047,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Преувеличенное энергопотребление"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА·ч"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Время использования: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> – <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> заряда батареи"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Использование с момента полной зарядки"</string>
@@ -3669,8 +3671,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Игры"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Другие приложения"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлы"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Память планшета"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Хранилище телефона"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"занято из <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"занято"</string>

diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 779cf4a..998e42d 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"වැඩියෙන් ගණනය කළ බල භාවිතය"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>ක් භාවිත කරන ලදී"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> වෙතින් <xliff:g id="PERCENT">%1$s</xliff:g>ක් භාවිතා කර ඇත"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"සමස්ත බැටරියෙන් <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"අවසන් පූර්ණ ආරෝපණයෙන් පසුව ප්‍රභේදනය"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"ක්‍රීඩා"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"වෙනත් යෙදුම්"</string>
     <string name="storage_files" msgid="8581083146777364063">"ගොනු"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ටැබ්ලට ආචයනය"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"දුරකථන ගබඞාව"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g>න් භාවිත කළ"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"භාවිතා කළ"</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5a70258..27bdad1 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -2047,6 +2047,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Používané <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> využila aplikácia <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> celkovej výdrže batérie"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Prehľad od posledného úplného nabitia"</string>
@@ -2883,7 +2885,7 @@
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Znížiť rozmazanie (odporúčané)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Znížiť blikanie"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"Obraz v obraze"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Žiadna z nainštalovaných aplikácií nepodporuje režim Obraz v obraze"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Žiadna z nainštalovaných aplikácií nepodporuje obraz v obraze"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip, obraz v"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Obraz v obraze"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Povoliť obraz v obraze"</string>
@@ -3669,8 +3671,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Hry"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ďalšie aplikácie"</string>
     <string name="storage_files" msgid="8581083146777364063">"Súbory"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Úložisko tabletu"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Úložisko telefónu"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Využité z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"využité"</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index fa9bac8..1b2498a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -2047,6 +2047,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Trajanje uporabe: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> uporablja <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> celotne napolnjenosti akumulatorja"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Razčlenitev od zadnje napol. akumulatorja"</string>
@@ -3100,7 +3102,7 @@
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Ni zahtevanih dovoljenj"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Vse aplikacije"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"Nameščene aplikacije"</string>
-    <string name="filter_instant_apps" msgid="574277769963965565">"Aplikacije brez nameščanja"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Nenamestljive aplikacije"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osebno"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Služba"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacije: vse"</string>
@@ -3569,10 +3571,10 @@
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Povežite se z internetom ali se obrnite na operaterja"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Ni na voljo v napravah, zaklenjenih na operaterja"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"Skupaj sproščeno: <xliff:g id="SIZE">%1$s</xliff:g>\n\nNazadnje zagnano: <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="web_action_enable_title" msgid="4051513950976670853">"Aplikacije brez nameščanja"</string>
+    <string name="web_action_enable_title" msgid="4051513950976670853">"Nenamestljive aplikacije"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Odpri povezave v aplikacijah, tudi če niso nameščene"</string>
-    <string name="web_action_section_title" msgid="7364647086538399136">"Aplikacije brez nameščanja"</string>
-    <string name="instant_apps_account" msgid="1433620209791992528">"Račun za aplikacije brez nameščanja"</string>
+    <string name="web_action_section_title" msgid="7364647086538399136">"Nenamestljive aplikacije"</string>
+    <string name="instant_apps_account" msgid="1433620209791992528">"Račun za nenamestljive aplikacije"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Nameščene aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Shrambo zdaj upravlja upravitelj shrambe"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Računi uporabnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3669,13 +3671,11 @@
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Shramba tabl. računalnika"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Pomnilnik telefona"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Uporabljeno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"uporab."</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Počisti aplikacijo"</string>
-    <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Ali želite odstraniti to aplikacijo brez nameščanja?"</string>
+    <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Ali želite odstraniti to nenamestljivo aplikacijo?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Zvočne datoteke"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(odstranjeno za uporabnika <xliff:g id="USER">%s</xliff:g>)"</string>
@@ -3688,7 +3688,7 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj shrambe: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Izklopljeno"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Vklopljeno"</string>
-    <string name="install_type_instant" msgid="3174425974536078647">"Aplikacija brez nameščanja"</string>
+    <string name="install_type_instant" msgid="3174425974536078647">"Nenamestljiva aplikacija"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Želite izklopiti upravitelja shrambe?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacije za filme in TV"</string>
     <string name="app_info_storage_title" msgid="5554719444625611987">"Uporabljen prostor"</string>

diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index b02f64a..e283ba2 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Përdorimi i energjisë i numëruar më shumë sa duhet"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Përdorur për <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> përdorur nga <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> nga e gjithë bateria"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Analiza që nga ngarkimi i fundit i plotë"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Lojëra"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Aplikacionet e tjera"</string>
     <string name="storage_files" msgid="8581083146777364063">"Skedarët"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Hapësira ruajtëse e tabletit"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Hapësira ruajtëse e telefonit"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Përdorur nga <xliff:g id="TOTAL">%1$s</xliff:g> gjithsej"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"e përdorur"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 8519b16..25267af 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -2026,6 +2026,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Прекомерно израчуната потрошња енергије"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Користи се <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> користи <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> укупног капацитета батерије"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Преглед од последњег потпуног пуњења"</string>
@@ -3618,8 +3620,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Игре"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Друге апликације"</string>
     <string name="storage_files" msgid="8581083146777364063">"Датотеке"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Меморија таблета"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Меморија телефона"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Искоришћено од укупно <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"у упот."</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 38ac080..aa3ecb1 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Har använts i <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> har använts av <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> av den totala batterianvändningen"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Fördelning sedan senaste fulladdningen"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Spel"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Andra appar"</string>
     <string name="storage_files" msgid="8581083146777364063">"Filer"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Surfplattans lagringsutrymme"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Mobilens lagringsutrymme"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"av <xliff:g id="TOTAL">%1$s</xliff:g> används"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"används"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 633ac45..07688af 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -1688,7 +1688,7 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Kisaidizi cha njia za mkato"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Onyesha njia za mkato zilizoko"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Chaguo-msingi"</string>
-    <string name="pointer_speed" msgid="1221342330217861616">"Kasi ya pointa"</string>
+    <string name="pointer_speed" msgid="1221342330217861616">"Kasi ya kiashiria"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Kidhibiti cha Mchezo"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Tumia kitetemeshaji"</string>
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Elekeza upya kitetemeshaji kwa kidhibiti cha mchezo wakati umeunganishwa."</string>
@@ -1791,7 +1791,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Muda wa kugusa na kushikilia"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Ugeuzaji rangi"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Huenda ikaathiri utendaji"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Bofya kishale kikiacha kusonga"</string>
+    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Bofya kiashiria kikiacha kusonga"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Muda wa kusubiri kabla ya kubofya"</string>
     <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"IMEWASHWA"</string>
@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Imetumika kwa <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> imetumiwa na <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Imetumia <xliff:g id="PERCENT">%1$s</xliff:g> ya chaji ya betri"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Uchanganuzi tangu mara ya mwisho ilipojaa chaji"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Michezo"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Programu zingine"</string>
     <string name="storage_files" msgid="8581083146777364063">"Faili"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Hifadhi ya kompyuta kibao"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Hifadhi ya simu"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"kati ya <xliff:g id="TOTAL">%1$s</xliff:g> zimetumika"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"imetumika"</string>

diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 4beb770..a69c722 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ஆற்றல் பயன்பாடு அதிகமாகப் பயன்படுத்தப்பட்டது"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>க்குப் பயன்படுத்தியது"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> பயன்படுத்துவது: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ஒட்டுமொத்த பேட்டரியில் <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"கடைசியாக முழுவதும் சார்ஜ் ஆனதிலிருந்து பிரேக் டவுன்"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"கேம்கள்"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"பிற பயன்பாடுகள்"</string>
     <string name="storage_files" msgid="8581083146777364063">"கோப்புகள்"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"டேப்லெட் சேமிப்பகம்"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"மொபைல் சேமிப்பகம்"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> இல் பயன்படுத்தியது:"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"உபயோகம்"</string>

diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index ad2adc2..f15edcf 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"అధిక గణన విద్యుత్ శక్తి వినియోగం"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> పాటు ఉపయోగించబడింది"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> ఉపయోగించింది"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"మొత్తం బ్యాటరీలో <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"చివరిసారి పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి వినియోగ వివరాలు"</string>
@@ -3569,8 +3571,6 @@
     <string name="storage_games" msgid="7703159201697117621">"గేమ్‌లు"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ఇతర అనువర్తనాలు"</string>
     <string name="storage_files" msgid="8581083146777364063">"ఫైల్‌లు"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"టాబ్లెట్ నిల్వ"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ఫోన్ నిల్వ"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g>లో ఉపయోగించబడింది"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"ఉపయోగించబడింది"</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f598aa9..2fb7cbb 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"การใช้พลังงานที่คำนวณมากเกินไป"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"ใช้ไป <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ใช้ไป <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ของแบตเตอรี่ทั้งหมด"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"รายละเอียดนับตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"เกม"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"แอปอื่นๆ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ไฟล์"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"พื้นที่จัดเก็บในแท็บเล็ต"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"พื้นที่เก็บข้อมูลโทรศัพท์"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"ที่ใช้ไปจากทั้งหมด <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"ใช้อยู่"</string>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 311fb2b..1ae5114 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Ginamit nang <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ang ginagamit ng <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ng kabuuang baterya"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown mula noong huling napuno ang baterya"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Mga Laro"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Iba pang mga app"</string>
     <string name="storage_files" msgid="8581083146777364063">"Mga File"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Storage ng tablet"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Storage ng telepono"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Nagamit sa <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"nagamit"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 25e11f3..4b7c4bb 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> süreyle kullanıldı"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> kadarı <xliff:g id="APP">%2$s</xliff:g> tarafından kullanılıyor"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Toplam pilin <xliff:g id="PERCENT">%1$s</xliff:g> kadarı"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Son tam şarj sonrası kullanım dökümü"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Oyunlar"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Diğer uygulamalar"</string>
     <string name="storage_files" msgid="8581083146777364063">"Dosyalar"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tablet depolama alanı"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefon depolama alanı"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Toplam <xliff:g id="TOTAL">%1$s</xliff:g> alanın kullanılan kısmı"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"kullanılan"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fbcc3b8..fafc756 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -2047,6 +2047,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Переоцінене енергоспоживання"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА/год"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Час використання: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> заряду використовує додаток <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> усього заряду"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Використання після повного заряджання"</string>
@@ -3669,8 +3671,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Ігри"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Інші додатки"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файли"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Пам’ять планшета"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Пам’ять телефона"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Використовується з <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"зайнято"</string>

diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index d1fc04c..182ae57 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"پاور کا ضرورت سے زیادہ استعمال"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> کیلئے استعمال کیا گیا"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> کے ذریعے <xliff:g id="PERCENT">%1$s</xliff:g> استعمال کیا گیا"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"مجموعی بیٹری میں سے <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"پچھلے مکمل چارج کے بعد سے تجزیہ"</string>
@@ -3565,8 +3567,6 @@
     <string name="storage_games" msgid="7703159201697117621">"گیمز"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"دیگر ایپس"</string>
     <string name="storage_files" msgid="8581083146777364063">"فائلز"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ٹیبلیٹ اسٹوریج"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"فون اسٹوریج"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> میں سے استعمال ہو گئی"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"مستعمل"</string>

diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index ae073d7..e82b166 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml

@@ -2009,6 +2009,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Orttirib hisoblangan quvvat sarfi"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mA/s"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Ishlatilgan vaqti: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> – <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> batareya quvvati"</string>
     <!-- String.format failed for translation -->
@@ -3577,8 +3579,6 @@
     <string name="storage_games" msgid="7703159201697117621">"O‘yinlar"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Boshqa ilovalar"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fayllar"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Planshet xotirasi"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefon xotirasi"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Jami: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"band"</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a120fce..4063326 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -2005,6 +2005,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Được sử dụng cho <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> được sử dụng bởi <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> trong tổng số thời lượng pin"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Chi tiết từ lần sạc đầy gần đây nhất"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Trò chơi"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ứng dụng khác"</string>
     <string name="storage_files" msgid="8581083146777364063">"Tệp"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Bộ nhớ máy tính bảng"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Bộ nhớ điện thoại"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Đã sử dụng <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"đã dùng"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1dbf691..0eb4cdd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"多算了的用电量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>毫安时"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"使用时间：<xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用电量占 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"整体用电量的 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"自上次充满电后的用电明细"</string>
@@ -3567,8 +3569,6 @@
     <string name="storage_games" msgid="7703159201697117621">"游戏"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"其他应用"</string>
     <string name="storage_files" msgid="8581083146777364063">"文件"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"平板电脑存储空间"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"手机存储空间使用情况"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"（总共 <xliff:g id="TOTAL">%1$s</xliff:g>）"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"已使用"</string>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index f511e6a..56a8df5 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -2006,6 +2006,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"計算過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用量佔 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"整體電量的 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"上次充滿電後的詳細用量"</string>
@@ -3570,8 +3572,6 @@
     <string name="storage_games" msgid="7703159201697117621">"遊戲"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"其他應用程式"</string>
     <string name="storage_files" msgid="8581083146777364063">"檔案"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"平板電腦的儲存空間"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"手機儲存空間"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"使用量：<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"已使用"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d4e5657..38a59e3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -2005,6 +2005,8 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"估計過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用量佔 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"整體電量的 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"上次充飽後的詳細用量資訊"</string>
@@ -2781,7 +2783,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"通知"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"進階"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Work 通知"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"允許使用圖示徽章"</string>
+    <string name="notification_badging_title" msgid="5125022693565388760">"允許在圖示上顯示標記"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"閃爍燈光"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"螢幕鎖定時"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
@@ -3571,8 +3573,6 @@
     <string name="storage_games" msgid="7703159201697117621">"遊戲"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"其他應用程式"</string>
     <string name="storage_files" msgid="8581083146777364063">"檔案"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"平板電腦儲存空間"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"手機儲存空間"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"總儲存空間：<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"已使用"</string>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index f37f407..422c1e2 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -2006,6 +2006,8 @@
     <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="battery_used_for" msgid="2690821851327075443">"Kusetshenziswe nge-<xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
+    <skip />
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> kusetshenziswe yi-<xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kwalo lonke ibhethri"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ukwaphuka kusuka ekushajeni okuphelele"</string>
@@ -3568,8 +3570,6 @@
     <string name="storage_games" msgid="7703159201697117621">"Amageyimu"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Ezinye izinhlelo zokusebenza"</string>
     <string name="storage_files" msgid="8581083146777364063">"Amafayela"</string>
-    <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Isitoreji sethebulethi"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Isitoreji sefoni"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Kusetshenziswe okungu-<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"okusetshenzisiwe"</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8f902e5..b631f8b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -4486,6 +4486,8 @@
     <string name="power_last_full_charge_summary"><xliff:g id="time">^1</xliff:g> ago</string>
     <!-- Label for list of apps using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->
     <string name="power_usage_list_summary">App usage since full charge (<xliff:g id="time">^1</xliff:g> ago)</string>
+    <!-- Label for device components using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->
+    <string name="power_usage_list_summary_device">Device usage since full charge (<xliff:g id="time">^1</xliff:g> ago)</string>
     <!-- Description for the screen usage item [CHAR_LIMIT=120] -->
     <string name="screen_usage_summary">Amount of time screen has been on since full charge</string>
     <!-- Label for list of different types using battery in power use UI [CHAR_LIMIT=60] -->
@@ -7399,11 +7401,11 @@
     <!-- Label for menu to launch a screen showing usage alerts for battery [CHAR LIMIT=30] -->
     <string name="additional_battery_info">Usage alerts</string>
 
-    <!-- Label for menu to show all apps in battery settings [CHAR LIMIT=30] -->
-    <string name="show_all_apps">Show all apps</string>
+    <!-- Label for menu to show battery usage in the device [CHAR LIMIT=45] -->
+    <string name="show_all_apps">Show full device usage</string>
 
-    <!-- Label for menu to hide extra apps in battery settings [CHAR LIMIT=30] -->
-    <string name="hide_extra_apps">Hide extra apps</string>
+    <!-- Label for menu to show app usage [CHAR LIMIT=30] -->
+    <string name="hide_extra_apps">Show app usage</string>
 
     <!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
     <string name="high_power_filter_on">Not optimized</string>

diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 1720c73..52f6793 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml

@@ -22,6 +22,6 @@
     <DropDownPreference
             android:key="turn_on_automatically"
             android:title="@string/battery_saver_turn_on_automatically_title"
-            android:summary="%s" />
+            android:summary="@string/summary_placeholder" />
 
 </PreferenceScreen>

diff --git a/res/xml/encryption_and_credential.xml b/res/xml/encryption_and_credential.xml
index a84c2a1..be643b1 100644
--- a/res/xml/encryption_and_credential.xml
+++ b/res/xml/encryption_and_credential.xml

@@ -15,7 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/encryption_and_credential_settings_title">
+        android:title="@string/encryption_and_credential_settings_title"
+        android:key="encryption_and_credentials_screen">
 
     <PreferenceCategory android:key="credentials_management"
             android:title="@string/credentials_title"

diff --git a/res/xml/location_scanning.xml b/res/xml/location_scanning.xml
index f82500b..5e7bd24 100644
--- a/res/xml/location_scanning.xml
+++ b/res/xml/location_scanning.xml

@@ -15,7 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/location_scanning_screen_title">
+        android:title="@string/location_scanning_screen_title"
+        android:key="scanning_screen">
 
         <SwitchPreference
             android:title="@string/location_scanning_wifi_always_scanning_title"

diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index d288a9d..33c1b0a 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml

@@ -124,7 +124,7 @@
         <DropDownPreference
           android:key="dock_audio_media"
           android:title="@string/dock_audio_media_title"
-          android:summary="%s" />
+          android:summary="@string/summary_placeholder" />
 
         <!-- Boot sounds -->
         <SwitchPreference
@@ -135,7 +135,7 @@
         <DropDownPreference
           android:key="emergency_tone"
           android:title="@string/emergency_tone_title"
-          android:summary="%s" />
+          android:summary="@string/summary_placeholder" />
 
         <com.android.settingslib.RestrictedPreference
           android:key="cell_broadcast_settings"

diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 22a4747..a936a50 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml

@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res-auto">
+                  xmlns:settings="http://schemas.android.com/apk/res-auto">
 
     <SwitchPreference
         android:key="usb_tether_settings"
@@ -23,7 +23,8 @@
 
     <SwitchPreference
         android:key="enable_wifi_ap"
-        android:title="@string/wifi_tether_checkbox_text" />
+        android:title="@string/wifi_tether_checkbox_text"
+        android:summary="@string/summary_two_lines_placeholder" />
 
     <Preference
         android:key="wifi_ap_ssid_and_security"
@@ -34,9 +35,9 @@
         android:key="enable_bluetooth_tethering"
         android:title="@string/bluetooth_tether_checkbox_text" />
 
-    <com.android.settings.DividerPreference
-            android:key="disabled_on_data_saver"
-            android:summary="@string/tether_settings_disabled_on_data_saver"
-            android:selectable="false"
-            settings:allowDividerAbove="true" />
+    <Preference
+        android:key="disabled_on_data_saver"
+        android:summary="@string/tether_settings_disabled_on_data_saver"
+        android:selectable="false"
+        settings:allowDividerAbove="true" />
 </PreferenceScreen>

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 9a149c3..678a63b 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java

@@ -102,6 +102,8 @@
     private static final String KEY_UNIFICATION = "unification";
     @VisibleForTesting
     static final String KEY_LOCKSCREEN_PREFERENCES = "lockscreen_preferences";
+    private static final String KEY_ENCRYPTION_AND_CREDENTIALS = "encryption_and_credential";
+    private static final String KEY_LOCATION_SCANNING  = "location_scanning";
 
     private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
     private static final int CHANGE_TRUST_AGENT_SETTINGS = 126;
@@ -930,7 +932,7 @@
 
         @Override
         public List<String> getNonIndexableKeys(Context context) {
-            final List<String> keys = new ArrayList<String>();
+            final List<String> keys = super.getNonIndexableKeys(context);
 
             LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
 
@@ -952,6 +954,14 @@
                 keys.add(KEY_ENTERPRISE_PRIVACY);
             }
 
+            // Duplicate in special app access
+            keys.add(KEY_MANAGE_DEVICE_ADMIN);
+            // Duplicates between parent-child
+            keys.add((new LocationPreferenceController(context)).getPreferenceKey());
+            keys.add(KEY_ENCRYPTION_AND_CREDENTIALS);
+            keys.add(KEY_SCREEN_PINNING);
+            keys.add(KEY_LOCATION_SCANNING);
+
             return keys;
         }
     }

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 761e8cf..b4ca6a6 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java

@@ -26,6 +26,7 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
 import android.support.annotation.XmlRes;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
@@ -423,11 +424,28 @@
         return -1;
     }
 
-    protected void removePreference(String key) {
-        Preference pref = findPreference(key);
-        if (pref != null) {
-            getPreferenceScreen().removePreference(pref);
+    protected boolean removePreference(String key) {
+        return removePreference(getPreferenceScreen(), key);
+    }
+
+    @VisibleForTesting
+    boolean removePreference(PreferenceGroup group, String key) {
+        final int preferenceCount = group.getPreferenceCount();
+        for (int i = 0; i < preferenceCount; i++) {
+            final Preference preference = group.getPreference(i);
+            final String curKey = preference.getKey();
+
+            if (TextUtils.equals(curKey, key)) {
+                return group.removePreference(preference);
+            }
+
+            if (preference instanceof PreferenceGroup) {
+                if (removePreference((PreferenceGroup) preference, key)) {
+                    return true;
+                }
+            }
         }
+        return false;
     }
 
     /**

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 5d797a7..9475f45 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java

@@ -37,7 +37,6 @@
 import android.os.UserManager;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index ab9f358..e88e3ba 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java

@@ -196,6 +196,8 @@
     BatterySipper mSipper;
     @VisibleForTesting
     BatteryStatsHelper mBatteryHelper;
+    @VisibleForTesting
+    BatteryUtils mBatteryUtils;
 
     protected ProcStatsData mStatsManager;
     protected ProcStatsPackageEntry mStats;
@@ -204,7 +206,6 @@
 
     private AppStorageStats mLastResult;
     private String mBatteryPercent;
-    private BatteryUtils mBatteryUtils;
 
     private final LoaderCallbacks<BatteryStatsHelper> mBatteryCallbacks =
             new LoaderCallbacks<BatteryStatsHelper>() {
@@ -729,8 +730,6 @@
             mDataPreference.setSummary(getDataSummary());
         }
 
-        updateBattery();
-
         if (!mInitialized) {
             // First time init: are we displaying an uninstalled app?
             mInitialized = true;
@@ -757,9 +756,10 @@
         return true;
     }
 
-    private void updateBattery() {
-        if (mSipper != null && mBatteryHelper != null) {
-            mBatteryPreference.setEnabled(true);
+    @VisibleForTesting
+    void updateBattery() {
+        mBatteryPreference.setEnabled(true);
+        if (isBatteryStatsAvailable()) {
             final int dischargeAmount = mBatteryHelper.getStats().getDischargeAmount(
                     BatteryStats.STATS_SINCE_CHARGED);
 
@@ -771,7 +771,6 @@
             mBatteryPercent = Utils.formatPercentage(percentOfMax);
             mBatteryPreference.setSummary(getString(R.string.battery_summary, mBatteryPercent));
         } else {
-            mBatteryPreference.setEnabled(false);
             mBatteryPreference.setSummary(getString(R.string.no_battery_summary));
         }
     }
@@ -805,6 +804,11 @@
         }
     }
 
+    @VisibleForTesting
+    boolean isBatteryStatsAvailable() {
+        return mBatteryHelper != null && mSipper != null;
+    }
+
     private static CharSequence getSize(Context context, AppStorageStats stats) {
         return Formatter.formatFileSize(context, stats.getTotalBytes());
     }
@@ -1043,9 +1047,15 @@
         } else if (preference == mDataPreference) {
             startAppInfoFragment(AppDataUsage.class, getString(R.string.app_data_usage));
         } else if (preference == mBatteryPreference) {
-            BatteryEntry entry = new BatteryEntry(getContext(), null, mUserManager, mSipper);
-            AdvancedPowerUsageDetail.startBatteryDetailPage((SettingsActivity) getActivity(), this,
-                    mBatteryHelper, BatteryStats.STATS_SINCE_CHARGED, entry, mBatteryPercent);
+            if (isBatteryStatsAvailable()) {
+                BatteryEntry entry = new BatteryEntry(getContext(), null, mUserManager, mSipper);
+                AdvancedPowerUsageDetail.startBatteryDetailPage((SettingsActivity) getActivity(),
+                        this, mBatteryHelper, BatteryStats.STATS_SINCE_CHARGED, entry,
+                        mBatteryPercent);
+            } else {
+                AdvancedPowerUsageDetail.startBatteryDetailPage((SettingsActivity) getActivity(),
+                        this, mPackageName);
+            }
         } else {
             return false;
         }

diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
index 73f4bbe..a08711c 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java

@@ -23,6 +23,7 @@
 import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 import android.text.TextUtils;
 
@@ -76,7 +77,9 @@
 
     protected ConfirmationDialogFragment newConfirmationDialogFragment(String selectedKey,
             CharSequence confirmationMessage) {
-        return ConfirmationDialogFragment.newInstance(this, selectedKey, confirmationMessage);
+        final ConfirmationDialogFragment fragment = new ConfirmationDialogFragment();
+        fragment.init(this, selectedKey, confirmationMessage);
+        return fragment;
     }
 
     protected CharSequence getConfirmationMessage(CandidateInfo info) {
@@ -90,33 +93,29 @@
         public static final String EXTRA_KEY = "extra_key";
         public static final String EXTRA_MESSAGE = "extra_message";
 
-        private final DialogInterface.OnClickListener mCancelListener;
-
-        private ConfirmationDialogFragment(DialogInterface.OnClickListener cancelListener) {
-            mCancelListener = cancelListener;
-        }
+        private DialogInterface.OnClickListener mCancelListener;
 
         @Override
         public int getMetricsCategory() {
             return MetricsProto.MetricsEvent.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG;
         }
 
-        public static ConfirmationDialogFragment newInstance(DefaultAppPickerFragment parent,
-                String key, CharSequence message) {
-            return newInstance(parent, key, message, null);
-        }
-
-        // TODO: add test case for cancelListener
-        public static ConfirmationDialogFragment newInstance(DefaultAppPickerFragment parent,
-                String key, CharSequence message, DialogInterface.OnClickListener cancelListener) {
-            final ConfirmationDialogFragment fragment = new ConfirmationDialogFragment(
-                    cancelListener);
+        /**
+         * Initializes the fragment.
+         *
+         * <p>Should be called after it's constructed.
+         */
+        public void init(DefaultAppPickerFragment parent, String key, CharSequence message) {
             final Bundle argument = new Bundle();
             argument.putString(EXTRA_KEY, key);
             argument.putCharSequence(EXTRA_MESSAGE, message);
-            fragment.setArguments(argument);
-            fragment.setTargetFragment(parent, 0);
-            return fragment;
+            setArguments(argument);
+            setTargetFragment(parent, 0);
+        }
+
+        // TODO: add test case for cancelListener
+        public void setCancelListener(DialogInterface.OnClickListener cancelListener) {
+            this.mCancelListener = cancelListener;
         }
 
         @Override

diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
index 6dcf7b8..d674522 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java

@@ -18,6 +18,7 @@
 
 import android.Manifest;
 import android.app.Activity;
+import android.app.Dialog;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -60,7 +61,7 @@
     /**
      * Set when the fragment is implementing ACTION_REQUEST_SET_AUTOFILL_SERVICE.
      */
-    public DialogInterface.OnClickListener mCancelListener;
+    private DialogInterface.OnClickListener mCancelListener;
     private final Handler mHandler = new Handler();
 
     @Override
@@ -75,15 +76,33 @@
             };
         }
 
-        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
+        mSettingsPackageMonitor.register(activity, activity.getMainLooper(), false);
         update();
     }
 
     @Override
     protected ConfirmationDialogFragment newConfirmationDialogFragment(String selectedKey,
             CharSequence confirmationMessage) {
-        return ConfirmationDialogFragment.newInstance(this, selectedKey, confirmationMessage,
-                mCancelListener);
+        final AutofillPickerConfirmationDialogFragment fragment =
+                new AutofillPickerConfirmationDialogFragment();
+        fragment.init(this, selectedKey, confirmationMessage);
+        return fragment;
+    }
+
+    /**
+     * Custom dialog fragment that has a cancel listener used to propagate the result back to
+     * caller (for the cases where the picker is launched by
+     * {@code android.settings.REQUEST_SET_AUTOFILL_SERVICE}.
+     */
+    public static class AutofillPickerConfirmationDialogFragment
+            extends ConfirmationDialogFragment {
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            final DefaultAutofillPicker target = (DefaultAutofillPicker) getTargetFragment();
+            setCancelListener(target.mCancelListener);
+            super.onCreate(savedInstanceState);
+        }
     }
 
     @Override

diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 7a2e4c0..580eb1b 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java

@@ -129,6 +129,17 @@
         args.putInt(EXTRA_POWER_USAGE_AMOUNT, (int) sipper.totalPowerMah);
 
         caller.startPreferencePanelAsUser(fragment, AdvancedPowerUsageDetail.class.getName(), args,
+                R.string.battery_details_title, null,
+                new UserHandle(UserHandle.getUserId(sipper.getUid())));
+    }
+
+    public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment,
+            String packageName) {
+        final Bundle args = new Bundle(2);
+        args.putString(EXTRA_PACKAGE_NAME, packageName);
+        args.putString(EXTRA_POWER_USAGE_PERCENT, Utils.formatPercentage(0));
+
+        caller.startPreferencePanelAsUser(fragment, AdvancedPowerUsageDetail.class.getName(), args,
                 R.string.battery_details_title, null, new UserHandle(UserHandle.myUserId()));
     }
 

diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
index 49a0179..89f03b3 100644
--- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java

@@ -98,6 +98,8 @@
     @VisibleForTesting
     Button mUninstallButton;
     @VisibleForTesting
+    String mPackageName;
+    @VisibleForTesting
     boolean mDisableAfterUninstall = false;
 
     private final int mRequestUninstall;
@@ -113,7 +115,6 @@
     private MetricsFeatureProvider mMetricsFeatureProvider;
 
     private LayoutPreference mButtonsPref;
-    private String mPackageName;
     private int mUserId;
     private boolean mUpdatedSysApp = false;
     private boolean mListeningToPackageRemove = false;
@@ -134,7 +135,6 @@
         mMetricsFeatureProvider = FeatureFactory.getFactory(activity).getMetricsFeatureProvider();
 
         mState = state;
-        mSession = mState.newSession(this);
         mDpm = dpm;
         mUserManager = userManager;
         mPm = packageManager;
@@ -145,10 +145,10 @@
         mRequestUninstall = requestUninstall;
         mRequestRemoveDeviceAdmin = requestRemoveDeviceAdmin;
 
-        lifecycle.addObserver(this);
-
         if (packageName != null) {
             mAppEntry = mState.getEntry(packageName, mUserId);
+            mSession = mState.newSession(this);
+            lifecycle.addObserver(this);
         } else {
             mFinishing = true;
         }
@@ -620,7 +620,11 @@
         return false;
     }
 
-    private boolean refreshUi() {
+    @VisibleForTesting
+    boolean refreshUi() {
+        if (mPackageName == null) {
+            return false;
+        }
         retrieveAppEntry();
         if (mAppEntry == null || mPackageInfo == null) {
             return false;

diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
new file mode 100644
index 0000000..04e2c7a
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+package com.android.settings.fuelgauge;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.PreferenceScreen;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.BatteryInfo;
+import com.android.settingslib.Utils;
+
+/**
+ * Controller that update the battery header view
+ */
+public class BatteryHeaderPreferenceController extends PreferenceController {
+    @VisibleForTesting
+    static final String KEY_BATTERY_HEADER = "battery_header";
+    @VisibleForTesting
+    BatteryMeterView mBatteryMeterView;
+    @VisibleForTesting
+    TextView mTimeText;
+    @VisibleForTesting
+    TextView mSummary;
+
+    private LayoutPreference mBatteryLayoutPref;
+
+    public BatteryHeaderPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mBatteryLayoutPref = (LayoutPreference) screen.findPreference(KEY_BATTERY_HEADER);
+        mBatteryMeterView = (BatteryMeterView) mBatteryLayoutPref
+                .findViewById(R.id.battery_header_icon);
+        mTimeText = (TextView) mBatteryLayoutPref.findViewById(R.id.battery_percent);
+        mSummary = (TextView) mBatteryLayoutPref.findViewById(R.id.summary1);
+
+        Intent batteryBroadcast = mContext.registerReceiver(null,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        final int batteryLevel = Utils.getBatteryLevel(batteryBroadcast);
+
+        mBatteryMeterView.setBatteryLevel(batteryLevel);
+        mTimeText.setText(Utils.formatPercentage(batteryLevel));
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BATTERY_HEADER;
+    }
+
+    public void updateHeaderPreference(BatteryInfo info) {
+        mTimeText.setText(Utils.formatPercentage(info.batteryLevel));
+        if (info.remainingLabel == null) {
+            mSummary.setText(info.statusLabel);
+        } else {
+            mSummary.setText(info.remainingLabel);
+        }
+
+        mBatteryMeterView.setBatteryLevel(info.batteryLevel);
+        mBatteryMeterView.setCharging(!info.discharging);
+    }
+}

diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java
index b9ed1e4..09f7c7a 100644
--- a/src/com/android/settings/fuelgauge/BatteryMeterView.java
+++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java

@@ -72,6 +72,10 @@
         }
     }
 
+    public int getBatteryLevel() {
+        return mDrawable.getBatteryLevel();
+    }
+
     public void setCharging(boolean charging) {
         mDrawable.setCharging(charging);
     }

diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index 6b7ddf9..45d0db2 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java

@@ -99,7 +99,6 @@
             }
         };
         mTriggerPref.init(this);
-
         mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
     }
 

diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index 10ffc49..be38855 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java

@@ -77,11 +77,11 @@
 
     @Override
     public boolean isAdvancedUiEnabled() {
-        return false;
+        return true;
     }
 
     @Override
     public boolean isPowerAccountingToggleEnabled() {
-        return false;
+        return true;
     }
 }

diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index b3d07b8..cd93c4b 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java

@@ -115,6 +115,7 @@
     @VisibleForTesting
     BatteryUtils mBatteryUtils;
 
+    private BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
     private LayoutPreference mBatteryLayoutPref;
     private PreferenceGroup mAppListGroup;
     private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
@@ -142,11 +143,6 @@
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-    }
-
-    @Override
     public void onPause() {
         BatteryEntry.stopRequestQueue();
         mHandler.removeMessages(BatteryEntry.MSG_UPDATE_NAME_ICON);
@@ -189,6 +185,8 @@
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         final List<PreferenceController> controllers = new ArrayList<>();
+        mBatteryHeaderPreferenceController = new BatteryHeaderPreferenceController(context);
+        controllers.add(mBatteryHeaderPreferenceController);
         controllers.add(new AutoBrightnessPreferenceController(context, KEY_AUTO_BRIGHTNESS));
         controllers.add(new TimeoutPreferenceController(context, KEY_SCREEN_TIMEOUT));
         controllers.add(new BatterySaverController(context, getLifecycle()));
@@ -416,7 +414,7 @@
                 new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
         BatteryInfo batteryInfo = BatteryInfo.getBatteryInfo(context, batteryBroadcast,
                 mStatsHelper.getStats(), elapsedRealtimeUs, false);
-        updateHeaderPreference(batteryInfo);
+        mBatteryHeaderPreferenceController.updateHeaderPreference(batteryInfo);
 
         final TypedValue value = new TypedValue();
         context.getTheme().resolveAttribute(android.R.attr.colorControlNormal, value, true);
@@ -429,8 +427,9 @@
         updateLastFullChargePreference(runningTime);
 
         final CharSequence timeSequence = Utils.formatElapsedTime(context, runningTime, false);
-        mAppListGroup.setTitle(
-                TextUtils.expandTemplate(getText(R.string.power_usage_list_summary), timeSequence));
+        final int resId = mShowAllApps ? R.string.power_usage_list_summary_device
+                : R.string.power_usage_list_summary;
+        mAppListGroup.setTitle(TextUtils.expandTemplate(getText(resId), timeSequence));
 
         if (averagePower >= MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP || USE_FAKE_DATA) {
             final List<BatterySipper> usageList = getCoalescedUsageList(
@@ -560,27 +559,6 @@
     }
 
     @VisibleForTesting
-    void updateHeaderPreference(BatteryInfo info) {
-        final Context context = getContext();
-        if (context == null) {
-            return;
-        }
-        final BatteryMeterView batteryView = (BatteryMeterView) mBatteryLayoutPref
-                .findViewById(R.id.battery_header_icon);
-        final TextView timeText = (TextView) mBatteryLayoutPref.findViewById(R.id.battery_percent);
-        final TextView summary1 = (TextView) mBatteryLayoutPref.findViewById(R.id.summary1);
-        timeText.setText(Utils.formatPercentage(info.batteryLevel));
-        if (info.remainingLabel == null ) {
-            summary1.setText(info.statusLabel);
-        } else {
-            summary1.setText(info.remainingLabel);
-        }
-
-        batteryView.setBatteryLevel(info.batteryLevel);
-        batteryView.setCharging(!info.discharging);
-    }
-
-    @VisibleForTesting
     double calculatePercentage(double powerUsage, double dischargeAmount) {
         final double totalPower = mStatsHelper.getTotalPower();
         return totalPower == 0 ? 0 :

diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index 19a22ba..fab700b 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java

@@ -18,7 +18,10 @@
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothProfile;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.database.ContentObserver;
 import android.net.ConnectivityManager;
 import android.net.Uri;
@@ -67,6 +70,7 @@
 
     private SettingObserver mAirplaneModeObserver;
     private Preference mPreference;
+    private TetherBroadcastReceiver mTetherReceiver;
 
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
     TetherPreferenceController() {
@@ -131,6 +135,11 @@
         if (mAirplaneModeObserver == null) {
             mAirplaneModeObserver = new SettingObserver();
         }
+        if (mTetherReceiver == null) {
+            mTetherReceiver = new TetherBroadcastReceiver();
+        }
+        mContext.registerReceiver(
+            mTetherReceiver, new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
         mContext.getContentResolver()
                 .registerContentObserver(mAirplaneModeObserver.uri, false, mAirplaneModeObserver);
     }
@@ -140,6 +149,9 @@
         if (mAirplaneModeObserver != null) {
             mContext.getContentResolver().unregisterContentObserver(mAirplaneModeObserver);
         }
+        if (mTetherReceiver != null) {
+            mContext.unregisterReceiver(mTetherReceiver);
+        }
     }
 
     @Override
@@ -238,4 +250,14 @@
             }
         }
     }
+
+    @VisibleForTesting
+    class TetherBroadcastReceiver extends BroadcastReceiver {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            updateSummary();
+        }
+
+    }
 }

diff --git a/src/com/android/settings/notification/SettingPref.java b/src/com/android/settings/notification/SettingPref.java
index 18efc33..cdbd5b3 100644
--- a/src/com/android/settings/notification/SettingPref.java
+++ b/src/com/android/settings/notification/SettingPref.java

@@ -121,6 +121,19 @@
         if (mTwoState != null) {
             mTwoState.setChecked(val != 0);
         } else if (mDropDown != null) {
+            if (mValues != null) {
+                int index = 0;
+                for (int len = mValues.length; index < len; index++) {
+                    if (mValues[index] == val) {
+                        break;
+                    }
+                }
+
+                if (index < mValues.length) {
+                    CharSequence entry = mDropDown.getEntries()[index];
+                    mDropDown.setSummary(entry);
+                }
+            }
             mDropDown.setValue(Integer.toString(val));
         }
     }

diff --git a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
index c636748..e28a594 100644
--- a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java

@@ -21,8 +21,7 @@
 import android.content.IContentProvider;
 import android.content.pm.PackageManager;
 import android.hardware.fingerprint.FingerprintManager;
-import android.os.Bundle;
-import android.provider.Settings;
+import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
@@ -31,33 +30,30 @@
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.notification.LockScreenNotificationPreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
+import com.android.settings.testutils.XmlTestUtils;
+import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
 import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-import com.android.settingslib.drawer.TileUtils;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
+import java.util.List;
 import java.util.Map;
-import org.robolectric.util.ReflectionHelpers;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -182,4 +178,26 @@
         securitySettings.setLockscreenPreferencesSummary(group);
         verify(preference).setSummary(1234);
     }
+
+    @Test
+    @Config (shadows = {
+            ShadowLockPatternUtils.class,
+    })
+    public void testNonIndexableKeys_existInXmlLayout() {
+        final Context context = spy(RuntimeEnvironment.application);
+        UserManager manager = mock(UserManager.class);
+        when(manager.isAdminUser()).thenReturn(false);
+        doReturn(manager).when(context).getSystemService(Context.USER_SERVICE);
+        final List<String> niks = SecuritySettings.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(context);
+
+        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context,
+                R.xml.security_settings_misc);
+        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
+                R.xml.location_settings));
+        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
+                R.xml.encryption_and_credential));
+
+        assertThat(keys).containsAllIn(niks);
+    }
 }

diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
new file mode 100644
index 0000000..cd48da3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java

@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2017 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.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SettingsPreferenceFragmentTest {
+
+    @Mock
+    private PreferenceManager mPreferenceManager;
+    private Context mContext;
+    private TestFragment mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mFragment = new TestFragment();
+    }
+
+    @Test
+    public void removePreference_nested_shouldRemove() {
+        final String key = "test_key";
+        final PreferenceScreen mScreen = spy(new PreferenceScreen(mContext, null));
+        when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
+
+        final PreferenceCategory nestedCategory = new ProgressCategory(mContext);
+        final Preference preference = new Preference(mContext);
+        preference.setKey(key);
+        preference.setPersistent(false);
+
+        mScreen.addPreference(nestedCategory);
+        nestedCategory.addPreference(preference);
+
+        assertThat(mFragment.removePreference(mScreen, key)).isTrue();
+        assertThat(nestedCategory.getPreferenceCount()).isEqualTo(0);
+    }
+
+    @Test
+    public void removePreference_flat_shouldRemove() {
+        final String key = "test_key";
+        final PreferenceScreen mScreen = spy(new PreferenceScreen(mContext, null));
+        when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
+
+        final Preference preference = mock(Preference.class);
+        when(preference.getKey()).thenReturn(key);
+
+        mScreen.addPreference(preference);
+
+        assertThat(mFragment.removePreference(mScreen, key)).isTrue();
+        assertThat(mScreen.getPreferenceCount()).isEqualTo(0);
+    }
+
+    @Test
+    public void removePreference_doNotExist_shouldNotRemove() {
+        final String key = "test_key";
+        final PreferenceScreen mScreen = spy(new PreferenceScreen(mContext, null));
+        when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
+
+        final Preference preference = mock(Preference.class);
+        when(preference.getKey()).thenReturn(key);
+
+        mScreen.addPreference(preference);
+
+        assertThat(mFragment.removePreference(mScreen, "not" + key)).isFalse();
+        assertThat(mScreen.getPreferenceCount()).isEqualTo(1);
+    }
+
+    public static final class TestFragment extends SettingsPreferenceFragment {
+
+        @Override
+        public int getMetricsCategory() {
+            return 0;
+        }
+    }
+
+
+}

diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
index a09aeec..f602236 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java

@@ -20,6 +20,8 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyDouble;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -46,10 +48,12 @@
 
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.instantapps.InstantAppButtonsController;
+import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -77,6 +81,8 @@
     private static final String PACKAGE_NAME = "test_package_name";
     private static final int TARGET_UID = 111;
     private static final int OTHER_UID = 222;
+    private static final double BATTERY_LEVEL = 60;
+    private static final String BATTERY_LEVEL_STRING = "60%";
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
@@ -89,20 +95,21 @@
     @Mock
     private DevicePolicyManager mDevicePolicyManager;
     @Mock
-    private Preference mBatteryPreference;
-    @Mock
     private BatterySipper mBatterySipper;
     @Mock
     private BatterySipper mOtherBatterySipper;
-    @Mock
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private BatteryStatsHelper mBatteryStatsHelper;
     @Mock
     private BatteryStats.Uid mUid;
     @Mock
     private PackageManager mPackageManager;
+    @Mock
+    private BatteryUtils mBatteryUtils;
 
     private InstalledAppDetails mAppDetail;
     private Context mShadowContext;
+    private Preference mBatteryPreference;
 
     @Before
     public void setUp() {
@@ -110,6 +117,10 @@
 
         mShadowContext = RuntimeEnvironment.application;
         mAppDetail = spy(new InstalledAppDetails());
+        mAppDetail.mBatteryUtils = mBatteryUtils;
+
+        mBatteryPreference = new Preference(mShadowContext);
+        mAppDetail.mBatteryPreference = mBatteryPreference;
 
         mBatterySipper.drainType = BatterySipper.DrainType.IDLE;
         mBatterySipper.uidObj = mUid;
@@ -409,4 +420,42 @@
         assertThat(mAppDetail.findTargetSipper(mBatteryStatsHelper, TARGET_UID)).isEqualTo(
                 mBatterySipper);
     }
+
+    @Test
+    public void updateBattery_noBatteryStats_summaryNo() {
+        doReturn(mShadowContext.getString(R.string.no_battery_summary)).when(mAppDetail).getString(
+                R.string.no_battery_summary);
+        mAppDetail.updateBattery();
+
+        assertThat(mBatteryPreference.getSummary()).isEqualTo(
+                "No battery use since last full charge");
+    }
+
+    @Test
+    public void updateBattery_hasBatteryStats_summaryPercent() {
+        mAppDetail.mBatteryHelper = mBatteryStatsHelper;
+        mAppDetail.mSipper = mBatterySipper;
+        doReturn(BATTERY_LEVEL).when(mBatteryUtils).calculateBatteryPercent(anyDouble(),
+                anyDouble(), anyDouble(), anyInt());
+        doReturn(mShadowContext.getString(R.string.battery_summary, BATTERY_LEVEL_STRING)).when(
+                mAppDetail).getString(R.string.battery_summary, BATTERY_LEVEL_STRING);
+        doReturn(new ArrayList<>()).when(mBatteryStatsHelper).getUsageList();
+
+        mAppDetail.updateBattery();
+
+        assertThat(mBatteryPreference.getSummary()).isEqualTo("60% use since last full charge");
+    }
+
+    @Test
+    public void isBatteryStatsAvailable_hasBatteryStatsHelperAndSipper_returnTrue() {
+        mAppDetail.mBatteryHelper = mBatteryStatsHelper;
+        mAppDetail.mSipper = mBatterySipper;
+
+        assertThat(mAppDetail.isBatteryStatsAvailable()).isTrue();
+    }
+
+    @Test
+    public void isBatteryStatsAvailable_parametersNull_returnFalse() {
+        assertThat(mAppDetail.isBatteryStatsAvailable()).isFalse();
+    }
 }

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 69bd767..d6b758c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java

@@ -28,6 +28,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -37,6 +38,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.BatteryStats;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.view.View;
 
 import com.android.internal.os.BatterySipper;
@@ -62,6 +64,8 @@
 import org.mockito.stubbing.Answer;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -261,4 +265,37 @@
         assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_ICON_ID)).isEqualTo(ICON_ID);
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(null);
     }
+
+    @Test
+    public void testStartBatteryDetailPage_WorkApp() {
+        final int appUid = 1010019;
+        mBatterySipper.mPackages = PACKAGE_NAME;
+        doReturn(appUid).when(mBatterySipper).getUid();
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
+                mBatteryEntry, USAGE_PERCENT);
+
+        verify(mTestActivity).startPreferencePanelAsUser(
+                any(), anyString(), any(), anyInt(), any(), eq(new UserHandle(10)));
+    }
+
+    @Test
+    public void testStartBatteryDetailPage_noBatteryUsage_hasBasicData() {
+        final ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class);
+        Answer<Void> callable = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) throws Exception {
+                mBundle = captor.getValue();
+                return null;
+            }
+        };
+        doAnswer(callable).when(mTestActivity).startPreferencePanelAsUser(any(), anyString(),
+                captor.capture(), anyInt(), any(), any());
+
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, PACKAGE_NAME[0]);
+
+        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
+                PACKAGE_NAME[0]);
+        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
+                "0%");
+    }
 }

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
index a341d83..b40cb9e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java

@@ -344,6 +344,14 @@
         assertThat(controllable).isTrue();
     }
 
+    @Test
+    public void testRefreshUi_packageNull_shouldNotCrash() {
+        mController.mPackageName = null;
+
+        // Should not crash in this method
+        assertThat(mController.refreshUi()).isFalse();
+    }
+
     /**
      * The test fragment which implements
      * {@link ButtonActionDialogFragment.AppButtonsDialogListener}

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
new file mode 100644
index 0000000..04bb2cf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java

@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+package com.android.settings.fuelgauge;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.BatteryManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
+import com.android.settingslib.BatteryInfo;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class,
+                ShadowDynamicIndexableContentMonitor.class
+        })
+public class BatteryHeaderPreferenceControllerTest {
+    private static final int BATTERY_LEVEL = 60;
+    private static final String TIME_LEFT = "2h30min";
+    private static final String BATTERY_STATUS = "Charging";
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private BatteryInfo mBatteryInfo;
+    private BatteryHeaderPreferenceController mController;
+    private Context mContext;
+    private BatteryMeterView mBatteryMeterView;
+    private TextView mTimeText;
+    private TextView mSummary;
+    private LayoutPreference mBatteryLayoutPref;
+    private Intent mBatteryIntent;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
+        mBatteryMeterView = new BatteryMeterView(mContext);
+        mTimeText = new TextView(mContext);
+        mSummary = new TextView(mContext);
+
+        mBatteryIntent = new Intent();
+        mBatteryIntent.putExtra(BatteryManager.EXTRA_LEVEL, BATTERY_LEVEL);
+        mBatteryIntent.putExtra(BatteryManager.EXTRA_SCALE, 100);
+        doReturn(mBatteryIntent).when(mContext).registerReceiver(any(), any());
+
+        mBatteryLayoutPref = new LayoutPreference(mContext, R.layout.battery_header);
+        doReturn(mBatteryLayoutPref).when(mPreferenceScreen).findPreference(
+                BatteryHeaderPreferenceController.KEY_BATTERY_HEADER);
+
+        mBatteryInfo.batteryLevel = BATTERY_LEVEL;
+
+        mController = new BatteryHeaderPreferenceController(mContext);
+        mController.mBatteryMeterView = mBatteryMeterView;
+        mController.mTimeText = mTimeText;
+        mController.mSummary = mSummary;
+    }
+
+    @Test
+    public void testDisplayPreference_displayBatteryLevel() {
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(((BatteryMeterView) mBatteryLayoutPref.findViewById(
+                R.id.battery_header_icon)).getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
+        assertThat(((TextView) mBatteryLayoutPref.findViewById(
+                R.id.battery_percent)).getText()).isEqualTo("60%");
+    }
+
+    @Test
+    public void testUpdatePreference_hasRemainingTime_showRemainingLabel() {
+        mBatteryInfo.remainingLabel = TIME_LEFT;
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        assertThat(mSummary.getText()).isEqualTo(mBatteryInfo.remainingLabel);
+    }
+
+    @Test
+    public void testUpdatePreference_updateBatteryInfo() {
+        mBatteryInfo.remainingLabel = TIME_LEFT;
+        mBatteryInfo.batteryLevel = BATTERY_LEVEL;
+        mBatteryInfo.discharging = true;
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        assertThat(mBatteryMeterView.mDrawable.getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
+        assertThat(mBatteryMeterView.mDrawable.getCharging()).isEqualTo(false);
+    }
+
+    @Test
+    public void testUpdatePreference_noRemainingTime_showStatusLabel() {
+        mBatteryInfo.remainingLabel = null;
+        mBatteryInfo.statusLabel = BATTERY_STATUS;
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        assertThat(mSummary.getText()).isEqualTo(BATTERY_STATUS);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index f32ea7a..8e9febe 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java

@@ -125,4 +125,14 @@
 
         assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isFalse();
     }
+
+    @Test
+    public void testIsAdvancedUiEnabled_returnTrue() {
+        assertThat(mPowerFeatureProvider.isAdvancedUiEnabled()).isTrue();
+    }
+
+    @Test
+    public void testIsPowerAccountingToggleEnabled_returnTrue() {
+        assertThat(mPowerFeatureProvider.isPowerAccountingToggleEnabled()).isTrue();
+    }
 }

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 615424c..ea6c7e6 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java

@@ -88,12 +88,9 @@
         })
 public class PowerUsageSummaryTest {
     private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"};
-    private static final String TIME_LEFT = "2h30min";
     private static final String STUB_STRING = "stub_string";
-    private static final int BATTERY_LEVEL = 55;
     private static final int UID = 123;
     private static final int POWER_MAH = 100;
-    private static final long REMAINING_TIME_US = 100000;
     private static final long TIME_SINCE_LAST_FULL_CHARGE_MS = 120 * 60 * 1000;
     private static final long TIME_SINCE_LAST_FULL_CHARGE_US =
             TIME_SINCE_LAST_FULL_CHARGE_MS * 1000;
@@ -132,8 +129,6 @@
     private TextView mBatteryPercentText;
     @Mock
     private TextView mSummary1;
-    @Mock
-    private BatteryInfo mBatteryInfo;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private BatteryStatsHelper mBatteryHelper;
     @Mock
@@ -206,8 +201,6 @@
         mFragment.mScreenUsagePref = mScreenUsagePref;
         mFragment.mLastFullChargePref = mLastFullChargePref;
         mFragment.mBatteryUtils = spy(new BatteryUtils(mRealContext));
-
-        mBatteryInfo.batteryLevel = BATTERY_LEVEL;
     }
 
     @Test
@@ -327,45 +320,6 @@
         assertThat(mPreference.getSummary().toString()).isEqualTo(expectedSummary);
     }
 
-    @Test
-    public void testUpdatePreference_hasRemainingTime_showRemainingLabel() {
-        mBatteryInfo.remainingLabel = TIME_LEFT;
-
-        mFragment.updateHeaderPreference(mBatteryInfo);
-
-        verify(mSummary1).setText(mBatteryInfo.remainingLabel);
-    }
-
-    @Test
-    public void testUpdatePreference_updateBatteryInfo() {
-        mBatteryInfo.remainingLabel = TIME_LEFT;
-        mBatteryInfo.batteryLevel = BATTERY_LEVEL;
-        mBatteryInfo.discharging = true;
-
-        mFragment.updateHeaderPreference(mBatteryInfo);
-
-        assertThat(mBatteryMeterView.mDrawable.getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
-        assertThat(mBatteryMeterView.mDrawable.getCharging()).isEqualTo(false);
-    }
-
-    @Test
-    public void testUpdatePreference_noRemainingTime_showStatusLabel() {
-        mBatteryInfo.remainingLabel = null;
-
-        mFragment.updateHeaderPreference(mBatteryInfo);
-
-        verify(mSummary1).setText(mBatteryInfo.statusLabel);
-    }
-
-    @Test
-    public void testUpdateHeaderPreference_asyncUpdate_shouldNotCrash() {
-        when(mFragment.getContext()).thenReturn(null);
-        mBatteryInfo.remainingTimeUs = REMAINING_TIME_US;
-
-        //Should not crash
-        mFragment.updateHeaderPreference(mBatteryInfo);
-    }
-
     private void testToggleAllApps(final boolean isShowApps) {
         mFragment.mShowAllApps = isShowApps;
 

diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index 7e92bc5..cecc910 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java

@@ -20,7 +20,10 @@
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothProfile;
+import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.database.ContentObserver;
 import android.net.ConnectivityManager;
 import android.provider.Settings;
@@ -41,6 +44,7 @@
 
 import java.util.concurrent.atomic.AtomicReference;
 
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -150,4 +154,36 @@
         verify(mPreference).setSummary(R.string.switch_off_text);
     }
 
+    @Test
+    public void onResume_shouldRegisterTetherReceiver() {
+        when(mContext.getContentResolver()).thenReturn(mock(ContentResolver.class));
+
+        mController.onResume();
+
+        verify(mContext).registerReceiver(
+            any(TetherPreferenceController.TetherBroadcastReceiver.class), any(IntentFilter.class));
+    }
+
+    @Test
+    public void onPause_shouldUnregisterTetherReceiver() {
+        when(mContext.getContentResolver()).thenReturn(mock(ContentResolver.class));
+        mController.onResume();
+
+        mController.onPause();
+
+        verify(mContext).unregisterReceiver(
+            any(TetherPreferenceController.TetherBroadcastReceiver.class));
+    }
+
+    @Test
+    public void tetherStatesChanged_shouldUpdateSummary() {
+        final Context context = RuntimeEnvironment.application;
+        ReflectionHelpers.setField(mController, "mContext", context);
+        mController.onResume();
+
+        context.sendBroadcast(new Intent(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
+
+        verify(mController).updateSummary();
+    }
+
 }

diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefTest.java
new file mode 100644
index 0000000..39f1377
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/SettingPrefTest.java

@@ -0,0 +1,67 @@
+package com.android.settings.notification;
+
+import android.content.res.Resources;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.DropDownPreference;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SettingPrefTest {
+
+    @Test
+    public void update_setsDropDownSummaryText() {
+        Context context = RuntimeEnvironment.application;
+        String testSetting = "test_setting";
+        int[] values = new int[] {1,2,3};
+        String[] entries = new String[] {"one", "two", "three"};
+        SettingPref settingPref =
+                spy(new SettingPref(SettingPref.TYPE_GLOBAL, "key", testSetting, 0, values) {
+                    @Override
+                    protected String getCaption(Resources res, int value) {
+                        return "temp";
+                    }
+                });
+        DropDownPreference dropdownPref = spy(new DropDownPreference(context));
+        dropdownPref.setEntries(entries);
+        settingPref.mDropDown = dropdownPref;
+        Settings.Global.putInt(context.getContentResolver(), testSetting, values[2]);
+
+        settingPref.update(context);
+
+        assertThat(settingPref.mDropDown.getSummary()).isEqualTo(entries[2]);
+    }
+
+    @Test
+    public void update_setsDropDownSummaryText_noMatch_noError() {
+        Context context = RuntimeEnvironment.application;
+        String testSetting = "test_setting";
+        int[] values = new int[] {1,2,3};
+        String[] entries = new String[] {"one", "two", "three"};
+        SettingPref settingPref =
+                spy(new SettingPref(SettingPref.TYPE_GLOBAL, "key", testSetting, 0, values) {
+                    @Override
+                    protected String getCaption(Resources res, int value) {
+                        return "temp";
+                    }
+                });
+        DropDownPreference dropdownPref = spy(new DropDownPreference(context));
+        dropdownPref.setEntries(entries);
+        settingPref.mDropDown = dropdownPref;
+        Settings.Global.putInt(context.getContentResolver(), testSetting, -1);
+
+        settingPref.update(context);
+
+        assertThat(settingPref.mDropDown.getSummary()).isNull();
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
new file mode 100644
index 0000000..b1419ba
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2017 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.testutils.shadow;
+
+import com.android.internal.widget.LockPatternUtils;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(LockPatternUtils.class)
+public class ShadowLockPatternUtils {
+
+    @Implementation
+    public boolean isSecure(int id) {
+        return true;
+    }
+}
commit	ed8b39fe60d84a3f7021c7e59f91d6623f1be36b	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Thu May 25 20:06:27 2017 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Thu May 25 20:06:28 2017 +0000
tree	33981b17f1481dde3825be74b48567949f865d33
parent	1a8c2dd899787d12b7f9e1b2485d3c1164a20f9e [diff]
parent	5fe7b7985c97fbbd6e827ef1ea2d494676f147be [diff]