diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 29b8700..03cdaa7 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Onbekende fout"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Koud"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Sigbaar vir alle nabye Bluetooth-toestelle (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Sigbaar vir alle Bluetooth-toestelle wat naby is"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nie sigbaar vir ander Bluetooth-toestelle nie"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Net sigbaar vir saamgebinde toestelle"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Aanvaar tans saambindingsversoeke (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Aanvaar tans saambindingsversoeke"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Aanvaar tans nie saambindingsversoeke nie"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Aanvaar tans nie saambindingsversoeke nie"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Sigbaarheid-tydperk"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sluit stembellery"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Voorkom die gebruik van die Bluetooth-beller wanneer die skerm gesluit is"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ontkoppel?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dit sal jou verbinding met &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; beëindig."</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitsaai"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"Aan"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Af"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Dekativeer profiel?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Dit deaktiveer:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Gekoppel"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"\'n Program wil jou foon sigbaar maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"\'n Program wil jou tablet sigbaar maak vir ander Bluetooth-toestelle. Jy kan dit later verander in Bluetooth-instellings."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"\'n Program wil jou foon sigbaar maak vir ander Bluetooth-toestelle. Jy kan dit later verander in Bluetooth-instellings."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth-uitsaai aanskakel om met ander nabygeleë toestelle te kommunikeer. Jy kan dit later in Bluetooth-instellings verander."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth en Bluetooth-uitsaai aanskakel om met ander nabygeleë toestelle te kommunikeer. Jy kan dit later in Bluetooth-instellings verander."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Wanneer hierdie kenmerk aangeskakel is, kan jou foon met ander nabygeleë toestelle kommunikeer.\n\nUitsaai gebruik laekrag-Bluetooth-seine."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"\'n Program wil Bluetooth aanskakel en jou tablet sigbaar maak vir ander toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"\'n Program wil Bluetooth aanskakel en jou foon sigbaar maak vir ander toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"\'n Program wil Bluetooth aanskakel en jou tablet sigbaar maak vir ander toestelle. Jy kan dit later verander in Bluetooth-instellings."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"\'n Progam wil Bluetooth aanskakel en jou foon sigbaar maak vir ander toestelle. Jy kan dit later verander in Bluetooth-instellings."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth-uitsaai aanskakel om met ander nabygeleë toestelle te kommunikeer. Jy kan dit later in Bluetooth-instellings verander."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth en Bluetooth-uitsaai aanskakel om met ander nabygeleë toestelle te kommunikeer. Jy kan dit later in Bluetooth-instellings verander."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Wanneer hierdie kenmerk aangeskakel is, kan jou foon met ander nabygeleë toestelle kommunikeer.\n\nUitsaai gebruik laekrag-Bluetooth-seine."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Skakel tans Bluetooth af…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Skakel tans Bluetooth af…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Outokoppel"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Stemoproepe"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ledig"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Foon ledig"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Onverklaar"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Oorbereken"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-voorgrond"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hou wakker"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tyd aan"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tyd sonder \'n sein"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Totale batterykapasiteit"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Berekende krag"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Min. ware krag"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Maks. ware krag"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Dwing stop"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Programinligting"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Program-instellings"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Kies batterybesparende modus"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Die program kan dalk instellings bied om batterygebruik te verminder"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Battery deur gebruiker gebruik"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Onverklaarde kragverbruik"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oorberekende kragverbruik"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedert uitgeprop is"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sedert laas uitgeprop vir <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Gebruikstotale"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 62071b9..4af86df 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"ያልታወቀ ስህተት"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"ቀዝቃዛ"</string>
     <string name="bluetooth" msgid="5549625000628014477">"ብሉቱዝ"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"ለሁሉም የብሉቱዝ መሣሪያዎች(<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>) የሚታይ"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"ለሁሉም የብሉቱዝ መሣሪያዎች የሚታይ"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ለሌሎች የብሉቱዝ መሣሪያዎች አይታይም"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ለተጣመሩ መሣሪያዎች ብቻ የሚታይ"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"የታይነትጊዜ አብቅቷል"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"በድምፅ መደወያ ቆልፍ"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ማያው ሲቆለፍ የብሉቱዝ ደዋዩ እንዳይጠቀምበት ተከላከል።"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ይለያይ?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&amp;gt ጋርያልዎትን ተያያዥ ያበቃል።"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ማሰራጨት"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"መገለጫ ይቦዝን?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"ይህ:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt; ያቦዝናል"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"ተገናኝቷል"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"አንድ መተግበሪያ ስልክዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"አንድ መተግበሪያ ጡባዊዎን ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"አንድ መተግበሪያ ስልክዎን ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> አጠገብ ካሉ ሌሎች መሣሪያዎች ጋር ለመገናኘት የብሉቱዝ ማሰራጨትን ማብራት ይፈልጋል። ይህን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ መቀየር ይችላሉ።"</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> አጠገብ ካሉ ሌሎች መሣሪያዎች ጋር ለመገናኘት ብሉቱዙን እና የብሉቱዝ ማሰራጨትን ማብራት ይፈልጋል። ይህን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ መቀየር ይችላሉ።"</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"ይህ ባህሪ ሲበራ የእርስዎ ስልክ አጠገብ ካሉ ሌሎች መሣሪያዎች ጋር መገናኘት ይችላል።\n\nማሰራጨት ባለአነስተኛ ኃይል የብሉቱዝ ምልክቶችን ነው የሚጠቀመው።"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"አንድ መተግበሪያ ብሉቱዝን አብርቶ ጡባዊዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"አንድ መተግበሪያ ብሉቱዝን አብርቶ ስልክዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"አንድ መተግበሪያ ብሉቱዝን አብርቶ ጡባዊዎን ለሌሎች መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"አንድ መተግበሪያ ብሉቱዝን አብርቶ ስልክዎን ለሌሎች መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> አጠገብ ካሉ ሌሎች መሣሪያዎች ጋር ለመገናኘት የብሉቱዝ ማሰራጨትን ማብራት ይፈልጋል። ይህን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ መቀየር ይችላሉ።"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"ይህ ባህሪ ሲበራ የእርስዎ ስልክ አጠገብ ካሉ ሌሎች መሣሪያዎች ጋር መገናኘት ይችላል።\n\nማሰራጨት ባለአነስተኛ ኃይል የብሉቱዝ ምልክቶችን ነው የሚጠቀመው።"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"ብሉቱዝ በማብራት ላይ..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"ብሉቱዝ በማጥፋት ላይ..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"በራስ ሰር ተገናኝ"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"የድምፅ ጥሪዎች"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ስራ ፈትጡባዊ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ስልክ ሥራ የፈታበት"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"ያልተቆጠረ"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"ከመጠን በላይ የተቆጠረ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ጠቅላላ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ቅድመ ገፅ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ነቃ ብሏል"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"ቪዲዮ"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"በሰዓቱ"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"ጊዜ ያለሲግናል"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"አጠቃላይ የባትሪ አቅም"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"የተሰላ ሃይል"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"ዝቅተኛ እውነተኛ ሃይል"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"ከፍተኛ እውነተኛ ሃይል"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"በኃይል ማቆም"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"የመተግበሪያ መረጃ"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"መተግበሪያ ቅንብሮች"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"የባትሪ ኃይል ቁጠባ ሁነታን ይምረጡ"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"መተግበሪያው የባትሪ ፍጆታን ለመቀነስ ቅንብሮችን ሊያቀርብ ይችላል"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"በተጠቃሚው ስራ ላይ የዋለው ባትሪ"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"ያልተቆጠረ የሃይል አጠቃቀም"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"ከመጠን በላይ የተቆጠረ የሃይል አጠቃቀም"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g>ከተነቀለ ጀምሮ"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"በመጨረሻ ለ<xliff:g id="UNPLUGGED">%1$s</xliff:g>  አልተሰካም"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"ጠቅላላ አጠቃቀም"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 170b737..3b4771b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"خطأ غير معروف"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"بارد"</string>
     <string name="bluetooth" msgid="5549625000628014477">"بلوتوث"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"مرئي لجميع أجهزة بلوتوث القريبة (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"مرئي لجميع أجهزة بلوتوث القريبة"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ليس مرئيًا لأجهزة بلوتوث الأخرى"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"مرئي فقط للأجهزة المقترنة"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"قبول طلبات الإقران (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"قبول طلبات الإقران"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"عدم قبول طلبات الإقران"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"عدم قبول طلبات الإقران"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"مهلة الرؤية"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"تأمين الطلب الصوتي"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"منع استخدام طالب البلوتوث عندما تكون الشاشة مؤمّنة"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"هل تريد قطع الاتصال؟"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏سيؤدي هذا إلى إنهاء الاتصال مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"البث"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"تشغيل"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"إيقاف"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"تعطيل الملف الشخصي؟"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"‏سيؤدي ذلك إلى تعطيل:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;من:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"متصل"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"يريد أحد التطبيقات أن يجعل هاتفك مرئيًا لأجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"يريد أحد التطبيقات جعل جهازك اللوحي مرئيًا لأجهزة بلوتوث الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"يريد أحد التطبيقات جعل هاتفك مرئيًا لأجهزة بلوتوث الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تشغيل بث البلوتوث للاتصال بالأجهزة القريبة الأخرى. ويمكنك تغيير ذلك لاحقًا من إعدادات البلوتوث."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تشغيل البلوتوث وبث البلوتوث للاتصال بالأجهزة القريبة الأخرى. ويمكنك تغيير ذلك لاحقًا من إعدادات البلوتوث."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"عند تشغيل هذه الاميزة، يمكن أن يتصل الهاتف بالأجهزة الأخرى.\n\nيستخدم البث إشارات بلوتوث منخفضة الطاقة."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"يريد أحد التطبيقات تشغيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"يريد أحد التطبيقات تشغيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"يريد أحد التطبيقات تشغيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"يريد أحد التطبيقات تشغيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تشغيل بث البلوتوث للاتصال بالأجهزة القريبة الأخرى. ويمكنك تغيير ذلك لاحقًا من إعدادات البلوتوث."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تشغيل البلوتوث وبث البلوتوث للاتصال بالأجهزة القريبة الأخرى. ويبقى بإمكانك تغيير ذلك لاحقًا من إعدادات البلوتوث."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"عند تشغيل هذه الاميزة، يمكن أن يتصل الهاتف بالأجهزة الأخرى.\n\nيستخدم البث إشارات بلوتوث منخفضة الطاقة."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"جارٍ تشغيل البلوتوث..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"جارٍ إيقاف تشغيل البلوتوث..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"اتصال تلقائي"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"المكالمات الصوتية"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"الجهاز اللوحي خامل"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"الهاتف خامل"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"غير مقدّر"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"استخدام زائد عن الحد"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"‏إجمالي استخدام CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU في المقدمة"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ابق متيقظًا"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"فيديو"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"وقت التشغيل"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"فترة انقطاع الإشارة"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"السعة الإجمالية للبطارية"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"الطاقة التي تمّ حسابها"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"الحد الأدنى للطاقة الفعلية"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"الحد الأقصى للطاقة الفعلية"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"فرض الإيقاف"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"عن التطبيق"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"إعدادات التطبيق"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"تحديد وضع توفير البطارية"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"قد يعرض التطبيق إعدادات لتقليل استخدام البطارية"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"البطارية التي يستهلكها المستخدم"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"استخدام غير مقدّر للطاقة"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"استخدام زائد عن الحد للطاقة"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> مللي أمبير في الساعة"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> منذ عدم التوصيل"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"أثناء آخر فترة من عدم التوصيل بـ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"إجمالي الاستخدام"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 81ec3c6..896334b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Неизвестна грешка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Студено"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видимо за всички у-ва с Bluetooth в района (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видимо за всички устройства с Bluetooth в района"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Не е видимо за други устройства с Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видимо само за сдвоени устройства"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Време за изчакване за видимост"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заключване на гласовото набиране"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратява употребата на набирането за Bluetooth при заключен екран"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Да се изключи ли?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Това ще прекрати връзката ви със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Излъчване"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Да се деактивира ли потребит. профил?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Това ще деактивира:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;От:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Установена е връзка"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Приложение иска да направи телефона ви видим за други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Приложение иска да направи таблета ви видим за други устройства с Bluetooth. Можете да промените това по-късно от настройките за функцията."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Приложение иска да направи телефона ви видим за други устройства с Bluetooth. Можете да промените това по-късно от настройките за функцията."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> иска да включи излъчването през Bluetooth, за да установи връзка с други устройства в района. Можете да промените това по-късно от съответните настройки."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> иска да включи Bluetooth и излъчването през Bluetooth, за да установи връзка с други устройства в района. Можете да промените това по-късно от съответните настройки."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Когато тази функция е включена, телефонът ви може да установи връзка с други устройства в района.\n\nИзлъчването използва сигнали с ниска мощност по стандарта Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Приложение иска да включи Bluetooth и да направи таблета ви видим за други устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Приложение иска да включи Bluetooth и да направи телефона ви видим за други устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Приложение иска да включи Bluetooth и да направи таблета ви видим за други устройства. Можете да промените това по-късно от настройките за функцията."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Приложение иска да включи Bluetooth и да направи телефона ви видим за други устройства. Можете да промените това по-късно от настройките за функцията."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> иска да включи излъчването през Bluetooth, за да установи връзка с други устройства в района. Можете да промените това по-късно от съответните настройки."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Когато тази функция е включена, телефонът ви може да установи връзка с други устройства в района.\n\nИзлъчването използва сигнали с ниска мощност по стандарта Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth се включва..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth се изключва…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Автоматично свързване"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Гласови обаждания"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Таблетът е неактивен"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Телефонът не се използва"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Неотчетено"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Отчетено в повече"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Процесор, общо"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор, на преден план"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Оставяне в будно състояние"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Видео"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Продължителност на включване"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Време без сигнал"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Общ капацитет на батерията"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Изчислено захранване"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Действително минимално захранване"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Действително максимално захранване"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Принудително спиране"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Информация за приложението"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Настройки за приложения"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Избиране на режим за запазване на батерията"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Приложението може да предлага настройки за намаляване на употребата на батерията"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Батерия, използвана от потребителя"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Неотчетено захранване"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Отчетено в повече захранване"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАч"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> след изключването"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"При последното изключване за <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Обща употреба"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index e94da8b..432e353 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconegut"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Fred"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible per a tots els dispositius Bluetooth propers (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible per a tots els dispositius Bluetooth propers"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ocult per a altres dispositius Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Només visible per als dispositius emparellats"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Temps de visibilitat"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloqueja el marcatge per veu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedeix l\'ús del marcador Bluetooth quan la pantalla estigui bloquejada"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vols desconnectar-te?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Això posarà fi a la teva connexió amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emissió"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vols desactivar el perfil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Aquesta acció desactivarà:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connectat"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Una aplicació vol que el telèfon sigui visible per a la resta de dispositius amb Bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicació vol que la tauleta sigui visible per a altres dispositius amb Bluetooth. Més endavant podràs canviar la configuració de Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Una aplicació vol que el telèfon sigui visible per a altres dispositius amb Bluetooth. Més endavant podràs canviar la configuració de Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol activar l\'emissió Bluetooth per comunicar-se amb altres dispositius propers. Pots canviar-ho més endavant a la configuració de Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol activar Bluetooth i l\'emissió Bluetooth per comunicar-se amb altres dispositius propers. Pots canviar-ho més endavant a la configuració de Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Si s\'activa aquesta funció, el telèfon pot comunicar-se amb altres dispositius propers.\n\nL\'emissió utilitza senyals Bluetooth de baix consum."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Una aplicació vol activar el Bluetooth i fer que la tauleta sigui visible per a la resta de dispositius durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Una aplicació vol activar el Bluetooth i fer que el telèfon sigui visible per a la resta de dispositius durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Una aplicació vol activar el Bluetooth i fer que la tauleta sigui visible per a la resta de dispositius. Més endavant podràs canviar la configuració de Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Una aplicació vol activar el Bluetooth i fer que el telèfon sigui visible per a la resta de dispositius. Més endavant podràs canviar la configuració de Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol activar l\'emissió Bluetooth per comunicar-se amb altres dispositius propers. Pots canviar-ho més endavant a la configuració de Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Si s\'activa aquesta funció, el telèfon pot comunicar-se amb altres dispositius propers.\n\nL\'emissió utilitza senyals Bluetooth de baix consum."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"S\'està activant el Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"S\'està desactivant Bluetooth??"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connexió automàtica"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Trucades de veu"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tauleta inactiva"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telèfon inactiu"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Sense comptabilitzar"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Comptabilitzada més d\'una vegada"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer pla de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Actiu"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Temps d\'activació"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Temps sense senyal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Capacitat total de la bateria"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Energia calculada"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Energia real mínima"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Energia real màxima"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Força l\'aturada"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informació de l\'aplicació"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Configuració de l\'aplicació"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecciona el mode d\'estalvi de bateria"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'aplicació pot oferir paràmetres per reduir l\'ús de la bateria"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateria utilitzada per l\'usuari"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Ús d\'energia sense comptabilitzar"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ús d\'energia comptabilitzat més d\'una vegada"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> des de la desconnexió"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Mentre es va desconnectar per darrera vegada durant <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totals d\'ús"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 461b220..f729dc0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Neznámá chyba"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Nejméně zajímavé"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Viditelné pro všechna okolní zařízení Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Viditelné pro všechny okolní zařízení Bluetooth"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Neviditelné pro ostatní zařízení Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Viditelné pouze pro spárovaná zařízení"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časový limit viditelnosti"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Uzamknout hlasové vytáčení"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabránit použití vytáčení Bluetooth při uzamčené obrazovce"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Odpojit?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tímto způsobem ukončíte připojení k zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Vysílání"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Deaktivovat profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Toto nastavení vypne profil:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Připojeno"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikace požaduje zviditelnění telefonu pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikace chce tablet zviditelnit pro ostatní zařízení Bluetooth. Toto můžete později změnit v nastavení Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikace chce telefon zviditelnit pro ostatní zařízení Bluetooth. Toto můžete později změnit v nastavení Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnout vysílání Bluetooth za účelem komunikace s ostatními zařízeními v okolí. Svoji volbu můžete později změnit v nastavení rozhraní Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnout Bluetooth a vysílání Bluetooth za účelem komunikace s ostatními zařízeními v okolí. Svoji volbu můžete později změnit v nastavení rozhraní Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Když je tato funkce zapnutá, váš telefon může komunikovat s ostatními zařízeními v okolí.\n\nVysílání využívá nízkoenergetické signály Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikace chce zapnout Bluetooth a na <xliff:g id="TIMEOUT">%1$d</xliff:g> s tablet zviditelnit pro ostatní zařízení."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikace chce zapnout Bluetooth a na <xliff:g id="TIMEOUT">%1$d</xliff:g> s telefon zviditelnit pro ostatní zařízení."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikace chce zapnout Bluetooth a zviditelnit tablet pro ostatní zařízení. Později to můžete změnit v nastavení Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikace chce zapnout Bluetooth a zviditelnit telefon pro ostatní zařízení. Později to můžete změnit v nastavení Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnout vysílání Bluetooth za účelem komunikace s ostatními zařízeními v okolí. Svoji volbu můžete později změnit v nastavení rozhraní Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Když je tato funkce zapnutá, váš telefon může komunikovat s ostatními zařízeními v okolí.\n\nVysílání využívá nízkoenergetické signály Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Zapínání Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vypínání rozhraní Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatické připojení"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet v nečinnosti"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"V nečinnosti"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Neobjasněno"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Nadhodnoceno"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Doba provozu procesoru"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popředí"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázat režim spánku"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Doba zapnutí"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Doba bez signálu"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Celková kapacita baterie"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Vypočítaná spotřeba energie"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Minimální skutečná spotřeba energie"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Maximální skutečná spotřeba energie"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Vynutit ukončení"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informace o aplikaci"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Nastavení aplikace"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Vyberte režim úspory baterie"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"V aplikaci mohou být k dispozici nastavení ke snížení spotřeby"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterie spotřebovaná uživatelem"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neobjasněná spotřeba energie"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadhodnocení spotřeby energie"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojení"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Při posledním odpojení pro <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Využití baterie celkem"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8a14ddd..3e01a2d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ukendt fejl"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kold"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Synlig for alle Bluetooth-enheder i nærheden (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Synlig for alle Bluetooth-enheder i nærheden"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ikke synlig for andre Bluetooth-enheder"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Kun synlig for parrede enheder"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout for synlighed"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lås stemmeopkald"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Bloker brug af Bluetooth-opkald, når skærmen er låst"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vil du afbryde?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dette vil afslutte din forbindelse med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Dataudveksling"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vil du deaktivere profilen?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Dette vil deaktivere:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Tilsluttet"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"En app ønsker at gøre din telefon synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"En app ønsker at gøre din tablet synlig for andre Bluetooth-enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"En app ønsker at gøre din telefon synlig for andre Bluetooth-enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker at aktivere dataudveksling via Bluetooth for at kommunikere med andre enheder i nærheden. Du kan ændre dette senere i indstillingerne for Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker at aktivere Bluetooth og dataudveksling via Bluetooth for at kommunikere med andre enheder i nærheden. Du kan ændre dette senere i indstillingerne for Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Når denne funktion er aktiveret, kan telefonen kommunikere med andre enheder i nærheden.\n\nDataudveksling bruger Bluetooth-signaler med et lavt strømforbrug."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"En app ønsker at aktivere Bluetooth og gøre din tablet synlig for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"En app ønsker at aktivere Bluetooth og gøre din telefon synlig for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"En app ønsker at aktivere Bluetooth og gøre din tablet synlig for andre enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"En app ønsker at aktivere Bluetooth og gøre din telefon synlig for andre enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker at aktivere dataudveksling via Bluetooth for at kommunikere med andre enheder i nærheden. Du kan ændre dette senere i indstillingerne for Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Når denne funktion er aktiveret, kan telefonen kommunikere med andre enheder i nærheden.\n\nDataudveksling bruger Bluetooth-signaler med et lavt strømforbrug."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Aktiverer Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth slukker??"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Opret automatisk forbindelse"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Stemmeopkald"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tabletcomputeren er ikke aktiv"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen er ikke aktiv"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Ikke medregnet"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Overvurderet"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU i alt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU forgrund"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hold aktiv"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tid til"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tid uden signal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Samlet batterikapacitet"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Beregnet strømforbrug"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Minimalt reelt strømforbrug"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Maksimalt reelt strømforbrug"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Tving til at standse"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Oplysninger om appen"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Indstillinger for app"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Vælg batteribesparende tilstand"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Denne app har muligvis indstillinger, der kan reducere batteriforbruget"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Brugerens batteriforbrug"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Ikke medregnet strømforbrug"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overvurderet strømforbrug"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden afbrydelse"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siden sidste afbrydelse for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Brugstotal"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index fb5b249..f407bfa 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Unbekannter Fehler"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kalt"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Sichtbar für alle Bluetooth-Geräte in der Nähe (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Sichtbar für alle Bluetooth-Geräte in der Nähe"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nicht sichtbar für andere Bluetooth-Geräte"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Nur sichtbar für Partnergeräte"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Pairing-Anfragen werden angenommen (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)."</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Pairing-Anfragen werden angenommen."</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Pairing-Anfragen werden nicht angenommen."</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Pairing-Anfragen werden nicht angenommen."</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Sichtbarkeit einstellen"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sprachwahl sperren"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Verwendung des Bluetooth-Dialers bei gesperrtem Bildschirm verhindern"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Verbindung trennen?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hierdurch wird die Verbindung mit&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; getrennt."</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Übertragung"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"An"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Aus"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil deaktivieren?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Deaktiviert:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Von:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Verbunden"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Eine App versucht, Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Eine App versucht, Ihr Tablet für andere Bluetooth-Geräte sichtbar zu machen. Sie können diese Einstellung später in den Bluetooth-Einstellungen ändern."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Eine App versucht, Ihr Telefon für andere Bluetooth-Geräte sichtbar zu machen. Sie können diese Einstellung später in den Bluetooth-Einstellungen ändern."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Für <xliff:g id="APP_NAME">%1$s</xliff:g> soll die Bluetooth-Übertragung aktiviert werden, um mit anderen Geräten in der Nähe zu kommunizieren. Sie können dies später in den Bluetooth-Einstellungen ändern."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"Für <xliff:g id="APP_NAME">%1$s</xliff:g> sollen Bluetooth und die Bluetooth-Übertragung aktiviert werden, um mit anderen Geräten in der Nähe zu kommunizieren. Sie können dies später in den Bluetooth-Einstellungen ändern."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Wenn diese Funktion aktiviert ist, kann Ihr Telefon mit anderen Geräten in der Nähe kommunizieren.\n\nFür die Übertragung werden stromsparende Bluetooth-Signale verwendet."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Eine App versucht, Bluetooth zu aktivieren und Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Geräte sichtbar zu machen."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Eine App versucht, Bluetooth zu aktivieren und Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Geräte sichtbar zu machen."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Eine App versucht, Bluetooth zu aktivieren und Ihr Tablet für andere Geräte sichtbar zu machen. Sie können diese Einstellung später in den Bluetooth-Einstellungen ändern."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Eine App versucht, Bluetooth zu aktivieren und Ihr Telefon für andere Geräte sichtbar zu machen. Sie können diese Einstellung später in den Bluetooth-Einstellungen ändern."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Für <xliff:g id="APP_NAME">%1$s</xliff:g> soll die Bluetooth-Übertragung aktiviert werden, um mit anderen Geräten in der Nähe zu kommunizieren. Sie können dies später in den Bluetooth-Einstellungen ändern."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"Für <xliff:g id="APP_NAME">%1$s</xliff:g> sollen Bluetooth und die Bluetooth-Übertragung aktiviert werden, um mit anderen Geräten in der Nähe zu kommunizieren. Sie können dies später in den Bluetooth-Einstellungen ändern."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Wenn diese Funktion aktiviert ist, kann Ihr Telefon mit anderen Geräten in der Nähe kommunizieren.\n\nFür die Übertragung werden stromsparende Bluetooth-Signale verwendet."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth wird aktiviert..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth wird deaktiviert..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatische Verbindung"</string>
@@ -1512,6 +1512,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Anrufe"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Ruhezustand"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Ruhezustand"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Nicht nachvollziehbar"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Zu hoch berechnet"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU insgesamt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU Vordergrund"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Aktiv lassen"</string>
@@ -1527,6 +1529,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Laufzeit"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Zeit ohne Signal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Akkuleistung insgesamt"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Berechneter Stromverbrauch"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Min. tatsächlicher Stromverbrauch"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Max. tatsächlicher Stromverbrauch"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Beenden erzwingen"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"App-Info"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"App-Einstellungen"</string>
@@ -1550,6 +1556,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Energiesparmodus auswählen"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Die App bietet unter Umständen Einstellungen für einen geringeren Akkuverbrauch."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Akkuverbrauch durch Nutzer"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Nicht nachvollziehbarer Stromverbrauch"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zu hoch berechneter Stromverbrauch"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> seit dem Ausstecken"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Seit dem letzten Ausstecken für <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Verbrauch insgesamt"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1de7d24..40da2ca 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Άγνωστο σφάλμα"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Κρύο"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Ορατό σε όλες τις κοντινές συσκευές Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Ορατό σε όλες τις κοντινές συσκευές Bluetooth"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Δεν είναι ορατό σε άλλες συσκευές Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Ορατό μόνο σε συζευγμένες συσκευές"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Αποδοχή αιτημάτων σύζευξης (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Αποδοχή αιτημάτων σύζευξης"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Δεν γίνονται αποδεκτά αιτήματα σύζευξης"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Δεν γίνονται αποδεκτά αιτήματα σύζευξης"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Λήξη χρονικού ορίου προβολής"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Κλείδωμα της λειτουργίας φωνητικών κλήσεων"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Να μην επιτρέπεται η χρήση του προγράμματος κλήσης bluetooth όταν η οθόνη είναι κλειδωμένη"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Αποσύνδεση;"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Θα τερματιστεί η σύνδεσή σας με τη συσκευή:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Μετάδοση"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"Ενεργό"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Ανενεργό"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Απενεργοπ. προφίλ;"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Αυτό θα απενεργοποιήσει το εξής:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Από:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Συνδεδεμένο"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Μια εφαρμογή θέλει να κάνει ορατό το τηλέφωνό σας σε άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Μια εφαρμογή θέλει να κάνει το tablet σας ορατό σε άλλες συσκευές Bluetooth. Μπορείτε να αλλάξετε την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Μια εφαρμογή θέλει να κάνει το τηλέφωνό σας ορατό σε άλλες συσκευές Bluetooth. Μπορείτε να αλλάξετε την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> επιθυμεί να ενεργοποιήσει τη μετάδοση Bluetooth για την επικοινωνία με άλλες συσκευές σε κοντινή απόσταση. Μπορείτε να το αλλάξετε αυτό αργότερα από τις ρυθμίσεις Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> επιθυμεί να ενεργοποιήσει το Bluetooth και τη μετάδοση Bluetooth για την επικοινωνία με άλλες συσκευές σε κοντινή απόσταση. Μπορείτε να το αλλάξετε αυτό αργότερα από τις ρυθμίσεις Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Όταν είναι ενεργοποιημένη αυτή η λειτουργία, το τηλέφωνό σας μπορεί να επικοινωνεί με άλλες συσκευές σε κοντινή απόσταση.\n\nΗ μετάδοση χρησιμοποιεί σήματα Bluetooth χαμηλής ισχύος."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth και να κάνει το tablet σας ορατό σε άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth και να κάνει το τηλέφωνό σας ορατό σε άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth και να κάνει το tablet σας ορατό σε άλλες συσκευές. Μπορείτε να αλλάξετε την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth και να κάνει το τηλέφωνό σας ορατό σε άλλες συσκευές. Μπορείτε να αλλάξετε την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> επιθυμεί να ενεργοποιήσει τη μετάδοση Bluetooth για την επικοινωνία με άλλες συσκευές σε κοντινή απόσταση. Μπορείτε να το αλλάξετε αυτό αργότερα από τις ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> επιθυμεί να ενεργοποιήσει το Bluetooth και τη μετάδοση Bluetooth για την επικοινωνία με άλλες συσκευές σε κοντινή απόσταση. Μπορείτε να το αλλάξετε αυτό αργότερα από τις ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Όταν είναι ενεργοποιημένη αυτή η λειτουργία, το τηλέφωνό σας μπορεί να επικοινωνεί με άλλες συσκευές σε κοντινή απόσταση.\n\nΗ μετάδοση χρησιμοποιεί σήματα Bluetooth χαμηλής ισχύος."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Ενεργοποίηση του Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Απενεργοποίηση Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Αυτόματη σύνδεση"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Φωνητικές κλήσεις"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Αδράνεια tablet"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Το τηλέφωνο είναι αδρανές"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Χωρίς εκτίμηση"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Υπερεκτίμηση"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Συνολικός χρόνος CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Προσκήνιο CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Διατήρηση λειτουρ."</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Βίντεο"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Η ώρα είναι ενεργοποιημένη"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Ώρα κατά τη μη κάλυψη σήματος"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Συνολική χωρητικότητα μπαταρίας"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Υπολογιζόμενη ισχύς"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Ελάχιστη πραγματική ισχύς"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Μέγιστη πραγματική ισχύς"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Αναγκαστική διακοπή"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Πληροφορίες εφαρμογής"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Ρυθμίσεις εφαρμογής"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Επιλέξτε κατάσταση εξοικονόμησης μπαταρίας"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Η εφαρμογή ενδέχεται να προσφέρει ρυθμίσεις που θα μειώσουν τη χρήση της μπαταρίας"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Μπαταρία που χρησιμοποιείται από το χρήστη"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Χωρίς εκτίμηση χρήσης ισχύος"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Υπερεκτίμηση χρήσης ισχύος"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> από την αποσύνδεση"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Από την τελευταία αποσύνδεση για <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Συνολικές τιμές χρήσης"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 4fa71ae..3892ceb 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Unknown error"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Cold"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible to all Bluetooth devices nearby (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible to all Bluetooth devices nearby"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Not visible to other Bluetooth devices"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Only visible to paired devices"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Accepting pairing requests (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Accepting pairing requests"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Not accepting pairing requests"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Not accepting pairing requests"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Visibility timeout"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lock voice dialling"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prevent use of the Bluetooth dialler when the screen is locked"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnect?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"On"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Off"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"This will disable:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connected"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"An app wants to make your phone visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"An app wants to make your tablet visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"An app wants to make your phone visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth and Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"When this feature is turned on, your phone can communicate with other devices nearby.\n\nBroadcasting uses low-power Bluetooth signals."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"An app wants to turn on Bluetooth and make your tablet visible to other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"An app wants to turn on Bluetooth and make your phone visible to other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"An app wants to turn on Bluetooth and make your tablet visible to other devices. You can change this later in Bluetooth settings."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth and Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"When this feature is turned on, your phone can communicate with other devices nearby.\n\nBroadcasting uses low-power Bluetooth signals."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Turning on Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Turning Bluetooth off…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Voice calls"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet idle"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Unaccounted"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Time on"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Time without a signal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Total battery capacity"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Computed power"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Min real power"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Max real power"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Force stop"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"App info"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"App settings"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Select battery-saving mode"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"The application may offer settings to reduce battery use"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Battery used by user"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Unaccounted power use"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Usage totals"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 4fa71ae..3892ceb 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Unknown error"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Cold"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible to all Bluetooth devices nearby (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible to all Bluetooth devices nearby"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Not visible to other Bluetooth devices"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Only visible to paired devices"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Accepting pairing requests (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Accepting pairing requests"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Not accepting pairing requests"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Not accepting pairing requests"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Visibility timeout"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lock voice dialling"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prevent use of the Bluetooth dialler when the screen is locked"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnect?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"On"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Off"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"This will disable:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connected"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"An app wants to make your phone visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"An app wants to make your tablet visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"An app wants to make your phone visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth and Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"When this feature is turned on, your phone can communicate with other devices nearby.\n\nBroadcasting uses low-power Bluetooth signals."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"An app wants to turn on Bluetooth and make your tablet visible to other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"An app wants to turn on Bluetooth and make your phone visible to other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"An app wants to turn on Bluetooth and make your tablet visible to other devices. You can change this later in Bluetooth settings."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth and Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"When this feature is turned on, your phone can communicate with other devices nearby.\n\nBroadcasting uses low-power Bluetooth signals."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Turning on Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Turning Bluetooth off…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Voice calls"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet idle"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Unaccounted"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Time on"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Time without a signal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Total battery capacity"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Computed power"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Min real power"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Max real power"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Force stop"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"App info"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"App settings"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Select battery-saving mode"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"The application may offer settings to reduce battery use"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Battery used by user"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Unaccounted power use"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Usage totals"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1746672..810b958 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconocido"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Frío"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible para todos los dispositivos Bluetooth cercanos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible para todos los dispositivos Bluetooth cercanos"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"No visible para otros dispositivos Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Solo visible para los dispositivos sincronizados"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Aceptando solicitudes de sincronización (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Aceptando solicitudes de sincronización"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Rechazando solicitudes de sincronización"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Rechazando solicitudes de sincronización"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Definir visibilidad"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcación por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir el uso de Bluetooth del dispositivo cuando la pantalla esté bloqueada."</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Esto pondrá fin a tu conexión con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisión"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"Activada"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Desactivar"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"¿Inhabilitar perfil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Esto inhabilitará &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Una aplicación quiere hacer visible tu dispositivo para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Una aplicación quiere hacer visible tu dispositivo para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la transmisión por Bluetooth para comunicarse con otros dispositivos cercanos. Puedes cambiar esta opción más tarde en la configuración de Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar Bluetooth y la transmisión por Bluetooth para comunicarse con otros dispositivos cercanos. Puedes cambiar esta opción más tarde en la configuración de Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Si esta función está activada, el teléfono puede comunicarse con otros dispositivos cercanos.\n\nLa transmisión utiliza señales de Bluetooth de bajo consumo de energía."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Una aplicación quiere activar el Bluetooth y hacer visible tu tablet para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Una aplicación quiere activar el Bluetooth y hacer visible tu dispositivo para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Una aplicación quiere activar el Bluetooth y hacer visible tu tablet para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Una aplicación quiere activar el Bluetooth y hacer visible tu dispositivo para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la transmisión por Bluetooth para comunicarse con otros dispositivos cercanos. Puedes cambiar esta opción más tarde en la configuración de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar Bluetooth y la transmisión por Bluetooth para comunicarse con otros dispositivos cercanos. Puedes cambiar esta opción más tarde en la configuración de Bluetooth."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Si esta función está activada, el teléfono puede comunicarse con otros dispositivos cercanos.\n\nLa transmisión utiliza señales de Bluetooth de bajo consumo de energía."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activando Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"¿Desactivar Bluetooth?"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conectar automáticamente"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ausente"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"No calculada"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Sobrecalculada"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantener en funcionamiento"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tiempo de activación"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tiempo sin una señal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Capacidad total de la batería"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Potencia calculada"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Potencia activa mínima"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Potencia activa máxima"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forzar la detención"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Información de la aplicación"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Configuración de aplicación"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecciona el modo de ahorro de batería."</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"La aplicación podrá ofrecer una configuración para reducir el uso de la batería."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batería utilizada por el usuario"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Uso de potencia no calculado"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculado"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desconectó"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Durante la última desconexión para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total de usos"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5203389..5d8c418 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconocido"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Nivel bajo"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Ajustes de Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible para dispositivos Bluetooth cercanos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible para dispositivos Bluetooth cercanos"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Oculto para otros dispositivos Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Solo visible para dispositivos sincronizados"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Aceptando solicitudes de vinculación (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Aceptando solicitudes de vinculación"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Rechazando solicitudes de vinculación"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Rechazando solicitudes de vinculación"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tiempo de visibilidad"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcación por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Evitar el uso del marcador a través de Bluetooth cuando la pantalla esté bloqueada"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Finalizará la conexión con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emisiones"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"Activadas"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Desactivadas"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"¿Inhabilitar perfil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Se inhabilitará&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;de&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Una aplicación quiere hacer visible tu teléfono para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Una aplicación quiere hacer visible tu teléfono para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar las emisiones de Bluetooth para comunicarse con otros dispositivos cercanos. Puedes cambiar esta opción más tarde en los ajustes de Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar el Bluetooth y las emisiones de Bluetooth para comunicarse con otros dispositivos cercanos. Puedes cambiar esta opción más tarde en los ajustes de Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Si esta función está activada, el teléfono puede comunicarse con otros dispositivos cercanos.\n\nLas emisiones utilizan señales de Bluetooth de baja energía."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Una aplicación quiere activar el Bluetooth y hacer visible tu tablet para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Una aplicación quiere activar el Bluetooth y hacer visible tu teléfono para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Una aplicación quiere activar el Bluetooth y hacer visible tu tablet para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Una aplicación quiere activar el Bluetooth y hacer visible tu teléfono para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar las emisiones de Bluetooth para comunicarse con otros dispositivos cercanos. Puedes cambiar esta opción más tarde en los ajustes de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar el Bluetooth y las emisiones de Bluetooth para comunicarse con otros dispositivos cercanos. Puedes cambiar esta opción más tarde en los ajustes de Bluetooth."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Si esta función está activada, el teléfono puede comunicarse con otros dispositivos cercanos.\n\nLas emisiones utilizan señales de Bluetooth de baja energía."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activando Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desactivando Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conexión automática"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactivo"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Desconocida"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Sobrecalculada"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Activo"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tiempo encendida"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tiempo sin señal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Capacidad total de la batería"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Potencia calculada"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Potencia real mínima"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Potencia real máxima"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forzar detención"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Información de la aplicación"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Ajustes de aplicación"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecciona el modo de ahorro de batería"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Es posible que la aplicación incluya opciones que permitan reducir el uso de la batería."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batería usada por el usuario"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Uso de potencia desconocido"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculado"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desenchufó"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Desde la última vez que se desenchufó para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total de consumo"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index da51f20..de683de 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Tundmatu viga"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Külm"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Nähtav kõigile lähedalasuvatele Bluetooth-seadmetele (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Nähtav kõigile lähedalasuvatele Bluetooth-seadmetele"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ei ole nähtav teistele Bluetooth-seadmetele"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Nähtav ainult seotud seadmetele"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Nähtavuse ajalõpp"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lukusta häälvalimine"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Vältige Bluetoothi valija kasutamist, kui ekraan on lukustatud"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Kas katkestada ühendus?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"See lõpetab teie ühenduse seadmega:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Edastamine"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Kas profiil keelata?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"See keelab:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;seadmest:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ühendatud"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Rakendus soovib muuta <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks teie telefoni teistele Bluetoothi seadmetele nähtavaks."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Rakendus soovib muuta tahvelarvuti nähtavaks teistele Bluetoothi seadmetele. Saate seda hiljem muuta Bluetoothi seadetes."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Rakendus soovib muuta telefoni nähtavaks teistele Bluetoothi seadmetele. Saate seda hiljem muuta Bluetoothi seadetes."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> tahab lülitada sisse Bluetooth-edastuse, et suhelda teiste läheduses olevate seadmetega. Saate seda hiljem muuta Bluetoothi seadetes."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> tahab lülitada sisse Bluetoothi ja Bluetooth-edastuse, et suhelda teiste läheduses olevate seadmetega. Saate seda hiljem muuta Bluetoothi seadetes."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kui see funktsioon on sisse lülitatud, saab teie telefon suhelda teiste läheduses olevate seadmetega.\n\nEdastamiseks kasutatakse Bluetoothi väikese võimsusega signaale."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Rakendus soovib Bluetoothi sisse lülitada ja muuta tahvelarvuti teistele seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Rakendus soovib Bluetoothi sisse lülitada ja muuta telefoni teistele seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Rakendus soovib Bluetoothi sisse lülitada ja muuta tahvelarvuti teistele seadmetele nähtavaks. Saate seda hiljem muuta Bluetoothi seadetes."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Rakendus soovib Bluetoothi sisse lülitada ja muuta telefoni teistele seadmetele nähtavaks. Saate seda hiljem muuta Bluetoothi seadetes."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> tahab lülitada sisse Bluetooth-edastuse, et suhelda teiste läheduses olevate seadmetega. Saate seda hiljem muuta Bluetoothi seadetes."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kui see funktsioon on sisse lülitatud, saab teie telefon suhelda teiste läheduses olevate seadmetega.\n\nEdastamiseks kasutatakse Bluetoothi väikese võimsusega signaale."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetoothi sisselülitamine ..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetoothi väljalülitamine ..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automaatne ühendamine"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Tavakõned"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tahvelarvuti on ooterežiimis"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon tegevuseta"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Arvestamata"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Liigselt arvestatud"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kokku"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU esiplaanil"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hoia ärkvel"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Kestus"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Aeg ilma signaalita"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Aku koguvmahtuvus"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Arvutatud toide"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Minimaalne reaalne toide"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Maksimaalne reaalne toide"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Sunni peatuma"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Rakenduse teave"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Rakenduse seaded"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Valige akut säästev režiim"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Rakendus võib pakkuda akukasutust vähendavaid seadeid"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Kasutaja akukasutus"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Arvestamata energiatarbimine"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Liigselt arvestatud energiatarbimine"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> alates lahutamisest"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Alates viimasest lahutamisest <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Kasutus kokku"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 58a25c7..f0c64d3 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"خطای ناشناس"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"سرد"</string>
     <string name="bluetooth" msgid="5549625000628014477">"بلوتوث"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"قابل مشاهده برای تمام دستگاه‌های بلوتوث مجاور (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"قابل مشاهده برای تمام دستگاه‌های بلوتوث مجاور"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"برای دیگر دستگاه‌های بلوتوث قابل مشاهده نیست"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"فقط برای دستگاه‌های مرتبط شده قابل مشاهده است"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"پذیرفتن درخواست‌های مرتبط‌سازی (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"پذیرفتن درخواست‌های مرتبط‌سازی"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"عدم پذیرش درخواست‌های مرتبط‌سازی"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"عدم پذیرش درخواست‌های مرتبط‌سازی"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"پایان زمان قابل مشاهده بودن"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"قفل کردن شماره گیری صوتی"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ممانعت از استفاده شماره‌گیر بلوتوث هنگام قفل شدن صفحه"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"اتصال قطع شود؟"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏این کار اتصال شما را با این دستگاه قطع می‌کند:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"پخش"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"روشن"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"خاموش"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"غیر فعال کردن نمایه؟"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"‏این کار :&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt; را غیرفعال می‌کند"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"متصل"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"برنامه‌ای می‌خواهد تلفن شما را برای سایر دستگاه‌های بلوتوث به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"برنامه‌ای می‌خواهد رایانه لوحی شما را برای سایر دستگاه‌های بلوتوث قابل مشاهده کند. شما می‌توانید این حالت را بعداً در تنظیمات بلوتوث تغییر دهید."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"برنامه‌ای می‌خواهد تلفن شما را برای سایر دستگاه‌های بلوتوث قابل مشاهده کند. شما می‌توانید این حالت را بعداً در تنظیمات بلوتوث تغییر دهید."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد پخش بلوتوث را برای برقراری ارتباط با دستگاه‌های نزدیک دیگر روشن کند. این تنظیم را می‌توانید بعداً در تنظیمات بلوتوث تغییر دهید."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد بلوتوث و پخش بلوتوث را برای برقراری ارتباط با دستگاه‌های نزدیک دیگر روشن کند. این تنظیم را می‌توانید بعداً در تنظیمات بلوتوث تغییر دهید."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"هنگامی که این قابلیت روشن باشد، تلفن شما می‌تواند با دستگاه‌های نزدیک دیگر ارتباط برقرار کند.\n\nپخش از سیگنال‌های بلوتوث کم قدرت استفاده می‌کند."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"برنامه‌ای می‌خواهد بلوتوث را روشن کند و رایانه لوحی شما را برای سایر دستگاه‌ها به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"برنامه‌ای می‌خواهد بلوتوث را روشن کند و تلفن شما را برای سایر دستگاه‌های دیگر به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"برنامه‌ای می‌خواهد بلوتوث را روشن کند و رایانه لوحی شما را برای سایر دستگاه‌ها قابل مشاهده کند. شما می‌توانید این حالت را بعداً در تنظیمات بلوتوث تغییر دهید."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"برنامه‌ای می‌خواهد بلوتوث را روشن کند و تلفن شما را برای سایر دستگاه‌ها قابل مشاهده کند. شما می‌توانید این حالت را بعداً در تنظیمات بلوتوث تغییر دهید."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد پخش بلوتوث را برای برقراری ارتباط با دستگاه‌های نزدیک دیگر روشن کند. این تنظیم را می‌توانید بعداً در تنظیمات بلوتوث تغییر دهید."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"<xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد بلوتوث و پخش بلوتوث را برای برقراری ارتباط با دستگاه‌های نزدیک دیگر روشن کند. می‌توانید بعداً این تنظیم را در تنظیمات بلوتوث تغییر دهید."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"هنگامی که این قابلیت روشن باشد، تلفن شما می‌تواند با دستگاه‌های نزدیک دیگر ارتباط برقرار کند.\n\nپخش از سیگنال‌های بلوتوث کم قدرت استفاده می‌کند."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"روشن کردن بلوتوث؟؟؟"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"خاموش کردن بلوتوث؟؟؟"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"اتصال خودکار"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"تماس‌های صوتی"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"رایانهٔ لوحی آماده به کار"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"حالت بلااستفاده تلفن"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"محاسبه نشده"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"بیش از حد محاسبه شده"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"‏مقدار کل CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏پیش زمینه CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"بیدار باش"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"ویدئو"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"زمان روشن"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"زمان بدون سیگنال"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"ظرفیت کلی باتری"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"نیروی محاسبه شده"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"حداقل نیروی واقعی"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"حداکثر نیروی واقعی"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"توقف اجباری"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"اطلاعات برنامه"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"تنظیمات برنامه"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"انتخاب حالت صرفه‌جویی در مصرف باتری"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"این برنامه دارای تنظیماتی است که در میزان مصرف باتری صرفه‌جویی می‌کند"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"باتری استفاده شده توسط کاربر"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"نیروی مصرفی محاسبه نشده"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"نیروی مصرفی بیش از حد محاسبه شده"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> میلی‌آمپرساعت"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> از زمان جدا کردن"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"در حین قطع اتصال آخر برای <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"مقدار کل استفاده"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1f975c7..071793a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Tuntematon virhe"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kylmää"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Näkyy kaikille lähistöllä oleville Bluetooth-laitteille (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Näkyy kaikille lähistöllä oleville Bluetooth-laitteille"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ei näy muille Bluetooth-laitteille"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Näkyy vain laitepareille"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Näkyvyyden aikakatkaisu"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lukitse äänipuhelut"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Estä Bluetooth-puhelut kun näyttö on lukittu"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Katkaistaanko yhteys?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Katkaisee yhteyden laitteeseen:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Lähetys"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Poistetaanko profiili?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Tämä poistaa profiilin&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;laitteesta&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Yhdistetty"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Sovellus haluaa asettaa puhelimen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Sovellus haluaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi. Voit muuttaa valintaa myöhemmin Bluetooth-asetuksista."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Sovellus haluaa asettaa puhelimen muiden Bluetooth-laitteiden tunnistettavaksi. Voit muuttaa valintaa myöhemmin Bluetooth-asetuksista."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa ottaa Bluetooth-lähetyksen käyttöön voidakseen kommunikoida lähellä olevien laitteiden kanssa. Voit muuttaa asetusta myöhemmin valitsemalla Bluetooth-asetukset."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa ottaa Bluetoothin ja Bluetooth-lähetyksen käyttöön voidakseen kommunikoida lähellä olevien laitteiden kanssa. Voit muuttaa asetusta myöhemmin valitsemalla Bluetooth-asetukset."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kun ominaisuus on käytössä, puhelin voi kommunikoida lähellä olevien laitteiden kanssa.\n\nLähetykseen käytetään vähän virtaa kuluttavia Bluetooth-signaaleja."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimen muiden laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa tablet-laitteen muiden laitteiden tunnistettavaksi. Voit muuttaa valintaa myöhemmin Bluetooth-asetuksista."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimen muiden laitteiden tunnistettavaksi. Voit muuttaa valintaa myöhemmin Bluetooth-asetuksista."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa ottaa Bluetooth-lähetyksen käyttöön voidakseen kommunikoida lähellä olevien laitteiden kanssa. Voit muuttaa asetusta myöhemmin valitsemalla Bluetooth-asetukset."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kun ominaisuus on käytössä, puhelin voi kommunikoida lähellä olevien laitteiden kanssa.\n\nLähetykseen käytetään vähän virtaa kuluttavia Bluetooth-signaaleja."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth otetaan käyttöön…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth poistetaan käytöstä..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Yhdistä automaattisesti"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Äänipuhelut"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet pois käytöstä"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Puhelin on käyttämätön"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Tuntematon"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Yliarvioitu"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Suorittimen käyttöaika yhteensä"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Suorittimen käyttö etualalla"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ei virransäästötilaa"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Käytössäoloaika"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Katvealueella oltu aika"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Akun kokonaiskapasiteetti"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Laskettu virrankulutus"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Todellinen vähimmäiskulutus"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Todellinen enimmäiskulutus"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Pakota lopetus"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Sovelluksen tiedot"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Sovellusasetukset"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Valitse virransäästötila"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Sovellus saattaa tarjota käyttöön asetuksia, joiden avulla akun käyttöä voidaan vähentää."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Käyttäjien käyttämä akun virta"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Tuntematon virrankulutus"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Yliarvioitu virrankulutus"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> laturin irrottamisen jälkeen"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Laturin irrottamisen jälkeen (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Käyttö yhteensä"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index bcde25c..d446582 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erreur inconnue"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Peu populaire"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Identifiable par tous appareils Bluetooth à proximité (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Identifiable par appareils Bluetooth à proximité"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Non identifiable par d\'autres appareils Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Identifiable uniquement par les appareils associés"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Délai de visibilité"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquer les appels par reconnaissance vocale"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Désactiver les appels via Bluetooth lorsque l\'écran est verrouillé"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Voulez-vous vraiment vous déconnecter?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Cette opération va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Désactiver le profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Le profil :&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;va être désactivé sur :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connecté"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre tablette. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre téléphone. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la diffusion par Bluetooth pour communiquer avec d\'autres appareils à proximité. Vous pourrez ensuite annuler cette opération dans les paramètres Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer Bluetooth et la diffusion par Bluetooth pour communiquer avec d\'autres appareils à proximité. Vous pourrez ensuite annuler cette opération dans les paramètres Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Lorsque cette fonctionnalité est activée, votre téléphone peut communiquer avec les autres appareils à proximité.\n\nLa diffusion utilise les signaux Bluetooth à basse consommation."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Une application requiert l\'activation du Bluetooth et nécessite que d\'autres appareils puissent détecter votre tablette pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Une application requiert l\'activation du Bluetooth et nécessite que d\'autres appareils puissent détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Une application requiert l\'activation du Bluetooth et nécessite que d\'autres appareils puissent détecter votre tablette. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Une application requiert l\'activation du Bluetooth et nécessite que d\'autres appareils puissent détecter votre téléphone. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la diffusion par Bluetooth pour communiquer avec d\'autres appareils à proximité. Vous pourrez ensuite annuler cette opération dans les paramètres Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Lorsque cette fonctionnalité est activée, votre téléphone peut communiquer avec les autres appareils à proximité.\n\nLa diffusion utilise les signaux Bluetooth à basse consommation."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activation du Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Désactivation du Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connexion automatique"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Appels vocaux"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablette inactive"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Téléphone inactif"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Non prise en compte"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Surestimée"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Durée d\'utilisation totale de l\'UC"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"UC - Premier plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Maintenir activé"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Vidéo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Durée d\'activation"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Durée sans signal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Capacité totale de la pile"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Utilisation calculée de la pile"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Utilisation minimale réelle de la pile"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Utilisation maximale réelle de la pile"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forcer l\'arrêt"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informations sur l\'application"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Paramètres de l\'application"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Sélectionnez le mode Économie de la pile"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'application dispose peut-être de paramètres permettant de réduire l\'utilisation de la batterie."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batterie utilisée par l\'utilisateur"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Utilisation non prise en compte de la pile"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilisation surestimée de la pile"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Depuis le dernier débranchement (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Utilisation totale"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0b8d773..0e8d0f7 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erreur inconnue"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Peu populaire"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible par tous appareils Bluetooth à proximité (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible par appareils Bluetooth à proximité"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Non visible par d\'autres appareils Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visible uniquement par les appareils associés"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Délai de visibilité"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquer les appels par reconnaissance vocale"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Désactiver les appels via le Bluetooth lorsque l\'écran est verrouillé"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Déconnecter ?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Cela va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Désactiver le profil ?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Le profil :&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;va être désactivé sur :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connecté"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre tablette. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre téléphone. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"L\'activation de la diffusion via le Bluetooth est requise pour communiquer avec d\'autres appareils à proximité par le biais de l\'application <xliff:g id="APP_NAME">%1$s</xliff:g>. Vous pouvez la désactiver plus tard dans les paramètres Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"L\'activation du Bluetooth et de la diffusion via le Bluetooth est requise pour communiquer avec d\'autres appareils à proximité par le biais de l\'application <xliff:g id="APP_NAME">%1$s</xliff:g>. Vous pouvez les désactiver plus tard dans les paramètres Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Lorsque cette fonctionnalité est activée, une communication peut être établie entre votre téléphone et d\'autres appareils à proximité.\n\nDes signaux Bluetooth basse consommation sont utilisés à cet effet."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Une application requiert l\'activation du Bluetooth et nécessite que d\'autres appareils puissent détecter votre tablette pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Une application requiert l\'activation du Bluetooth et nécessite que d\'autres appareils puissent détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Une application requiert l\'activation du Bluetooth et nécessite que d\'autres appareils puissent détecter votre tablette. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Une application requiert l\'activation du Bluetooth et nécessite que d\'autres appareils puissent détecter votre téléphone. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"L\'activation de la diffusion via le Bluetooth est requise pour communiquer avec d\'autres appareils à proximité par le biais de l\'application <xliff:g id="APP_NAME">%1$s</xliff:g>. Vous pouvez la désactiver plus tard dans les paramètres Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Lorsque cette fonctionnalité est activée, une communication peut être établie entre votre téléphone et d\'autres appareils à proximité.\n\nDes signaux Bluetooth basse consommation sont utilisés à cet effet."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activation du Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Désactivation du Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connexion automatique"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Appels vocaux"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablette inactive"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Téléphone inactif"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Non prise en compte"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"En trop"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"UC - Durée totale"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"UC - Premier plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Maintenir activé"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Vidéo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Durée d\'activation"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Durée sans signal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Capacité totale de la batterie"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Consommation calculée"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Consommation minimale réelle"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Consommation maximale réelle"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forcer l\'arrêt"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informations sur l\'application"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Paramètres de l\'application"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Sélectionnez le mode Économie de batterie."</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'application dispose peut-être de paramètres permettant de réduire l\'utilisation de la batterie."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batterie utilisée par l\'utilisateur"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consommation non prise en compte"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consommation en trop"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Depuis le dernier débranchement (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Utilisation totale"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index bd7428c..02f09bb 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"अज्ञात त्रुटि"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"ठंडा"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"आसपास के सब Bluetooth उप. के लि‍ए दिखाई दे रहा है (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"सभी आस-पास के Bluetooth उपकरणों के लि‍ए दिखाई दे रहा है"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"अन्‍य Bluetooth उपकरणों के लि‍ए दिखाई नहीं दे रहा है"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"केवल युग्‍मि‍त उपकरणों के लि‍ए दिखाई दे रहा है"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"दृश्यता समयबाह्य"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ध्‍वनि डायलिंग लॉक करें"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"जब स्‍क्रीन लॉक हो, तो bluetooth डायलर के उपयोग को रोकें"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"डिस्‍कनेक्‍ट करें?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"इससे &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; के साथ आपका कनेक्‍शन समाप्त हो जाएगा"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"प्रोफ़ाइल अक्षम करें?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"इससे यह अक्षम हो जाएगी:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;इस पर:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"कनेक्ट किया गया"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"एक ऐप्स  आपके फ़ोन को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"एक ऐप्स  आपके टेबलेट को अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"एक ऐप्स  आपके फ़ोन को अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>, आस-पास के अन्य उपकरणों के साथ संचार करने के लिए Bluetooth प्रसारण चालू करना चाहता है. आप बाद में इसे Bluetooth सेटिंग में बदल सकते हैं."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g>, आस-पास के अन्य उपकरणों के साथ संचार करने के लिए Bluetooth और Bluetooth प्रसारण चालू करना चाहता है. आप बाद में इसे Bluetooth सेटिंग में बदल सकते हैं."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"इस सुविधा के चालू होने पर, आपका फ़ोन आस-पास के अन्य उपकरणों के साथ संचार कर सकता है.\n\nप्रसारण, कम-पावर वाले Bluetooth सिग्नल का उपयोग करता है."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"एक ऐप्स  Bluetooth को चालू करना और आपके टेबलेट को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"एक ऐप्स  Bluetooth को चालू करना और आपके फ़ोन को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"एक ऐप्स  Bluetooth को चालू करना और आपके टेबलेट को अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"एक ऐप्स  Bluetooth को चालू करना और आपके फ़ोन को अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>, आस-पास के अन्य उपकरणों के साथ संचार करने के लिए Bluetooth प्रसारण चालू करना चाहता है. आप बाद में इसे Bluetooth सेटिंग में बदल सकते हैं."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"इस सुविधा के चालू होने पर, आपका फ़ोन आस-पास के अन्य उपकरणों के साथ संचार कर सकता है.\n\nप्रसारण, कम-पावर वाले Bluetooth सिग्नल का उपयोग करता है."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth चालू हो रहा है.."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth बंद कर रहे हैं…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"स्‍वत: कनेक्‍ट करें"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"ध्‍वनि कॉल"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"टेबलेट निष्‍क्रिय"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"फ़ोन निष्‍क्रिय"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"बेहिसाब"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"अत्यधिक"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"कुल CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रभाग"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"सचेत रखें"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"वीडियो"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"चालू करने का समय"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"बिना किसी सिग्‍नल के समय"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"कुल बैटरी क्षमता"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"परिकलित पावर"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"न्यूनतम वास्तविक पावर"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"अधिकतम वास्तविक पावर"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"बंद करना बाध्‍य करें"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"ऐप्स जानकारी"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"ऐप्स सेटिंग"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"बैटरी की बचत मोड चुनें"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"बैटरी के उपयोग में कमी लाने के लिए ऐप्स, सेटिंग ऑफ़र कर सकता है"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"उपयोगकर्ता के द्वारा उपयोग की गई बैटरी"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"पावर का बेहिसाब उपयोग"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"पावर का अत्यधिक उपयोग"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"अनप्लग करने के बाद से <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"जब अंतिम बार <xliff:g id="UNPLUGGED">%1$s</xliff:g> के लिए अनप्‍लग किया गया"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"कुल उपयोग"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 106ff16..61712dd 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nepoznata pogreška"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Hladno"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vidljivo svim Bluetooth uređajima u blizini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vidljivo svim Bluetooth uređajima u blizini"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nije vidljiv drugim Bluetooth uređajima"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vidljivo samo uparenim uređajima"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Vidljivost je istekla"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zaključaj biranje glasom"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Spriječite upotrebu Bluetooth birača ako je zaslon zaključan"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Isključiti?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"To će prekinuti vašu vezu s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emitiranje"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Onemogućiti profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"To će onemogućiti:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;na uređaju:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Povezan"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikacija želi vaš telefon učiniti vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikacija želi učiniti vaše tabletno računalo vidljivim drugim Bluetooth uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikacija želi učiniti vaš telefon vidljivim drugim Bluetooth uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth emitiranje radi komunikacije s ostalim uređajima u blizini. To možete promijeniti kasnije u postavkama Bluetootha."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth i Bluetooth emitiranje radi komunikacije s ostalim uređajima u blizini. To možete promijeniti kasnije u postavkama Bluetootha."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kada je ta značajka uključena, vaš telefon može komunicirati s ostalim uređajima u blizini.\n\nEmitiranje se koristi Bluetooth signalima male snage."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikacija želi uključiti Bluetooth i vaše tabletno računalo učiniti vidljivim drugim uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikacija želi uključiti Bluetooth i vaš telefon učiniti vidljivim drugim uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikacija želi uključiti Bluetooth i vaše tabletno računalo učiniti vidljivim drugim uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikacija želi uključiti Bluetooth i vaš telefon učiniti vidljivim drugim uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth emitiranje radi komunikacije s ostalim uređajima u blizini. To možete promijeniti kasnije u postavkama Bluetootha."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kada je ta značajka uključena, vaš telefon može komunicirati s ostalim uređajima u blizini.\n\nEmitiranje se koristi Bluetooth signalima male snage."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Uključivanje Bluetootha…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Isključivanje Bluetootha?"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatsko povezivanje"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Glasovni pozivi"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tabletni uređaj u mirovanju"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u mirovanju"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Neizračunato"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Previše obračunato"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Ukupno CPU-a"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Glavni zadatak CPU-a"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zadrži u aktivnom stanju"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Videozapis"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Vrijeme uključenosti"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Vrijeme bez signala"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Ukupan kapacitet baterije"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Izračunata energija"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Minimalna stvarna energija"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Maksimalna stvarna energija"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Prisilno zaustavi"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informacije o aplikaciji"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Postavke aplikacije"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Odaberite način štednje baterije"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikacija možda nudi postavke za smanjenje potrošnje baterije"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterija koju upotrebljava korisnik"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neizračunata upotreba energije"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Previše obračunata upotreba energije"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od isključivanja"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Kod posljednjeg isključivanja za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Ukupno iskorištenje"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index dd8cf62..7a1cc0b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ismeretlen hiba történt"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Közömbös"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Az összes közeli Bluetooth eszköz számára látható (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Az összes közeli Bluetooth eszköz számára látható"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nem látható a többi Bluetooth eszköz számára"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Csak párosított eszközök számára látható"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Párosítási kérelmek elfogadása (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Párosítási kérelmek elfogadása"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Párosítási kérelmek elutasítása"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Párosítási kérelmek elutasítása"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Láthatóság időkerete"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Hanghívás zárolása"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"A bluetooth tárcsázó használatának megakadályozása, ha a képernyő le van zárva"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Leválasztja?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ezzel befejezi a kapcsolatot a következővel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Sugárzás"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"Be"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Ki"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil tiltása?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Ezzel kikapcsolja a következőt:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ettől:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Csatlakozva"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Egy alkalmazás láthatóvá akarja tenni a telefont más Bluetooth-eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Az egyik alkalmazás láthatóvá akarja tenni a táblagépet más eszközök számára. Ezt később módosíthatja a Bluetooth beállításokban."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Az egyik alkalmazás láthatóvá akarja tenni a telefont más eszközök számára. Ezt később módosíthatja a Bluetooth beállításokban."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> szeretné bekapcsolni a Bluetooth-sugárzást a közeli eszközökkel való kommunikációhoz. Ezt később a Bluetooth beállításaiban módosíthatja."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> szeretné bekapcsolni a Bluetooth-kapcsolatot és a Bluetooth-sugárzást a közeli eszközökkel való kommunikációhoz. Ezt később a Bluetooth beállításaiban módosíthatja."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Ha a funkció be van kapcsolva, telefonja képes a közelben lévő többi eszközzel kommunikálni.\n\nA sugárzás kis energiájú Bluetooth-jeleket használ."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Az egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a táblagépet láthatóvá akarja tenni más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Az egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a telefont láthatóvá akarja tenni más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Az egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a táblagépet láthatóvá akarja tenni más eszközök számára. Ezt később módosíthatja a Bluetooth beállításokban."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Az egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a telefont láthatóvá akarja tenni más eszközök számára. Ezt később módosíthatja a Bluetooth beállításokban."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> szeretné bekapcsolni a Bluetooth-sugárzást a közeli eszközökkel való kommunikációhoz. Ezt később a Bluetooth beállításaiban módosíthatja."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> szeretné bekapcsolni a Bluetooth-kapcsolatot és a Bluetooth-sugárzást a közeli eszközökkel való kommunikációhoz. Ezt később a Bluetooth beállításaiban módosíthatja."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Ha a funkció be van kapcsolva, telefonja képes a közelben lévő többi eszközzel kommunikálni.\n\nA sugárzás kis energiájú Bluetooth-jeleket használ."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth bekapcsolása?"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth kikapcsolása…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatikus csatlakozás"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Hanghívások"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Táblagép - tétlen"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon - tétlen"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Elszámolatlan"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Túlbecsült"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU teljes"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-használat az előtérben"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ébren tartás"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Videó"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Bekapcsolva eltöltött idő"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Jel nélkül eltelt idő"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Teljes akkumulátorkapacitás"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Kiszámított teljesítmény"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Min. valós teljesítmény"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Max. valós teljesítmény"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Kényszerített leállítás"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Alkalmazásinformáció"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Alkalmazásbeállítások"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Energiatakarékos mód kiválasztása"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Az alkalmazás felkínálhat olyan beállításokat, amelyek csökkentik az energiafelhasználást"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"A felhasználó akkumulátorhasználata"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Elszámolatlan energiafogyasztás"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Túlbecsült energiafogyasztás"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> az utolsó töltés óta"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Töltés nélkül eltöltött idő: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Használat összesen"</string>
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy-rAM/arrays.xml
deleted file mode 100644
index ab0f8a8..0000000
--- a/res/values-hy-rAM/arrays.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-**
-** Copyright 2007 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.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="timezone_filters">
-    <item msgid="5296756001147094692">"Ամերիկա"</item>
-    <item msgid="3005562397632768392">"Եվրոպա"</item>
-    <item msgid="5696915123093701218">"Աֆրիկա"</item>
-    <item msgid="4439789052790868249">"Ասիա"</item>
-    <item msgid="956915953069815961">"Ավստրալիա"</item>
-    <item msgid="5345178126174698955">"Խաղաղօվկիանոսյան"</item>
-    <item msgid="8392017019801393511">"Բոլորը"</item>
-  </string-array>
-  <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 վայրկյան"</item>
-    <item msgid="8881760709354815449">"30 վայրկյան"</item>
-    <item msgid="7589406073232279088">"1 րոպե"</item>
-    <item msgid="7001195990902244174">"2 րոպե"</item>
-    <item msgid="7489864775127957179">"5 րոպե"</item>
-    <item msgid="2314124409517439288">"10 րոպե"</item>
-    <item msgid="6864027152847611413">"30 րոպե"</item>
-  </string-array>
-  <string-array name="dream_timeout_entries">
-    <item msgid="3149294732238283185">"Երբեք"</item>
-    <item msgid="2194151041885903260">"15 վայրկյան"</item>
-    <item msgid="5892295237131074341">"30 վայրկյան"</item>
-    <item msgid="3538441365970038213">"1 րոպե"</item>
-    <item msgid="412343871668955639">"2 րոպե"</item>
-    <item msgid="5076853889688991690">"5 րոպե"</item>
-    <item msgid="1903860996174927898">"10 րոպե"</item>
-    <item msgid="6415509612413178727">"30 րոպե"</item>
-  </string-array>
-  <string-array name="lock_after_timeout_entries">
-    <item msgid="8929270399652145290">"Անմիջապես"</item>
-    <item msgid="6736512735606834431">"5 վայրկյան"</item>
-    <item msgid="8044619388267891375">"15 վայրկյան"</item>
-    <item msgid="1822002388249545488">"30 վայրկյան"</item>
-    <item msgid="8538071621211916519">"1 րոպե"</item>
-    <item msgid="5663439580228932882">"2 րոպե"</item>
-    <item msgid="49888496216106852">"5 րոպե"</item>
-    <item msgid="9002737361305019353">"10 րոպե"</item>
-    <item msgid="4322676235684793329">"30 րոպե"</item>
-  </string-array>
-  <string-array name="entries_font_size">
-    <item msgid="8166647333858618801">"Փոքր"</item>
-    <item msgid="1932071435506638315">"Սովորական"</item>
-    <item msgid="38373998008112077">"Մեծ"</item>
-    <item msgid="7786168277516233536">"Վիթխարի"</item>
-  </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Շատ դանդաղ"</item>
-    <item msgid="2361722960903353554">"Դանդաղ"</item>
-    <item msgid="1145554631248513562">"Սովորական"</item>
-    <item msgid="7553665153391107454">"Արագ"</item>
-    <item msgid="1370673569131070146">"Ավելի արագ"</item>
-    <item msgid="4648206845228970803">"Շատ արագ"</item>
-    <item msgid="4977949754169483251">"Սրընթաց"</item>
-    <item msgid="6106302964845503577">"Չափազանց արագ"</item>
-    <item msgid="6800277205640837264">"Ամենաարագ"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Շատ ցածր"</item>
-    <item msgid="2692137425242433765">"Ցածր"</item>
-    <item msgid="3332408460740717754">"Սովորական"</item>
-    <item msgid="4907380534957572531">"Բարձր"</item>
-    <item msgid="4699640516390840297">"Շատ բարձր"</item>
-  </string-array>
-  <string-array name="wifi_status">
-    <item msgid="1922181315419294640"></item>
-    <item msgid="8934131797783724664">"Սկանավորում…"</item>
-    <item msgid="8513729475867537913">"Միանում է..."</item>
-    <item msgid="515055375277271756">"Նույնականացում…"</item>
-    <item msgid="1943354004029184381">"IP հասցեն գտնվում է...."</item>
-    <item msgid="4221763391123233270">"Միացված է"</item>
-    <item msgid="624838831631122137">"Կասեցված է"</item>
-    <item msgid="7979680559596111948">"Անջատվում է…"</item>
-    <item msgid="1634960474403853625">"Անջատված է"</item>
-    <item msgid="746097431216080650">"Անհաջող"</item>
-    <item msgid="6367044185730295334">"Արգելափակված"</item>
-    <item msgid="503942654197908005">"Ժամանակավորապես խուսափելով թույլ կապից"</item>
-  </string-array>
-  <string-array name="wifi_status_with_ssid">
-    <item msgid="7714855332363650812"></item>
-    <item msgid="8878186979715711006">"Սկանավորում...."</item>
-    <item msgid="355508996603873860">"Միանում է <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ին…"</item>
-    <item msgid="554971459996405634">"Նույնականացում <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ի հետ…"</item>
-    <item msgid="7928343808033020343">"IP հասցեի ստացում <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ից…"</item>
-    <item msgid="8937994881315223448">"Միացված է <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ին"</item>
-    <item msgid="1330262655415760617">"Անջատված"</item>
-    <item msgid="7698638434317271902">"Անջատվում է <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ից…"</item>
-    <item msgid="197508606402264311">"Անջատված"</item>
-    <item msgid="8578370891960825148">"Անհաջող"</item>
-    <item msgid="5660739516542454527">"Արգելափակված"</item>
-    <item msgid="1805837518286731242">"Վատ ցանցից ժամանակավոր խուսափում"</item>
-  </string-array>
-    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
-    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
-    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
-    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
-    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
-    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
-    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
-  <string-array name="wifi_eap_method">
-    <item msgid="1160193392455075561">"PEAP"</item>
-    <item msgid="7981731051382306293">"TLS"</item>
-    <item msgid="2892994535305020162">"TTLS"</item>
-    <item msgid="435667726254379514">"PWD"</item>
-  </string-array>
-  <string-array name="wifi_p2p_wps_setup">
-    <item msgid="5085064298144493867">"Սեղմման կոճակ"</item>
-    <item msgid="1624323946324499595">"Հավասարազոր սարքի PIN-ը"</item>
-    <item msgid="5366790421523328066">"PIN-ը այս սարքից"</item>
-  </string-array>
-  <string-array name="wifi_p2p_status">
-    <item msgid="1701505390737218306">"Միացված է"</item>
-    <item msgid="3189211552661432651">"Հրավիրված է"</item>
-    <item msgid="3206450250360237549">"Անհաջող"</item>
-    <item msgid="7785896708926971207">"Հասանելի"</item>
-    <item msgid="2330782789550628803">"Ընդգրկույթից դուրս"</item>
-  </string-array>
-  <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="8151962652413645395">"2 րոպե"</item>
-    <item msgid="8675215713017289017">"5 րոպե"</item>
-    <item msgid="477015974247590543">"1 ժամ"</item>
-    <item msgid="5198271470953124739">"Ժամանակի սպառումը բացառել"</item>
-  </string-array>
-  <string-array name="wifi_signal">
-    <item msgid="2245412278046491293">"Թույլ"</item>
-    <item msgid="5615082285463430971">"Բավարար"</item>
-    <item msgid="3565079809875324621">"Լավ"</item>
-    <item msgid="5702329417707689835">"Հիանալի"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Միշտ"</item>
-    <item msgid="844721238536786870">"Միայն երբ միացված է"</item>
-    <item msgid="2990218920631468642">"Երբեք (մեծացնում է տվյալների օգտագործումը)"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Միշտ"</item>
-    <item msgid="7433294150916905997">"Միայն երբ միացված է"</item>
-    <item msgid="1390404486722375028">"Երբեք"</item>
-  </string-array>
-  <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Ինքնաշխատ"</item>
-    <item msgid="6670588712989942178">"Միայն 5 ԳՀց"</item>
-    <item msgid="2715516524973207876">"միայն 2.4 ԳՀց"</item>
-  </string-array>
-  <string-array name="usage_stats_display_order_types">
-    <item msgid="2100172576767439288">"Օգտագործման ժամանակը"</item>
-    <item msgid="3703676222230317933">"Գործարկումների թիվը"</item>
-    <item msgid="2502754479975776899">"Ծրագրի անունը"</item>
-  </string-array>
-  <string-array name="wifi_eap_entries">
-    <item msgid="8615575908717909498">"PEAP"</item>
-    <item msgid="8667872640594311615">"TLS"</item>
-    <item msgid="7182812872984827322">"TTLS"</item>
-    <item msgid="2318274046749286642">"PWD"</item>
-  </string-array>
-  <string-array name="wifi_peap_phase2_entries">
-    <item msgid="2577747762745812488">"Ոչ մեկը"</item>
-    <item msgid="937786527870979616">"MSCHAPV2"</item>
-    <item msgid="5302613883318643629">"GTC"</item>
-  </string-array>
-  <string-array name="wifi_phase2_entries">
-    <item msgid="1818786254010764570">"Ոչ մեկը"</item>
-    <item msgid="6189918678874123056">"PAP"</item>
-    <item msgid="1524112260493662517">"MSCHAP"</item>
-    <item msgid="5923246669412752932">"MSCHAPV2"</item>
-    <item msgid="8651992560135239389">"GTC"</item>
-  </string-array>
-  <string-array name="wifi_ip_settings">
-    <item msgid="3906714200993111074">"DHCP"</item>
-    <item msgid="628395202971532382">"Ստատիկ"</item>
-  </string-array>
-  <string-array name="wifi_proxy_settings">
-    <item msgid="4473276491748503377">"Ոչ մեկը"</item>
-    <item msgid="8673874894887358090">"Ձեռքով"</item>
-  </string-array>
-  <string-array name="emergency_tone_entries">
-    <item msgid="5165439859689033665">"Անջատել"</item>
-    <item msgid="3165868966179561687">"Ահազանգ"</item>
-    <item msgid="6038758039030476855">"Թրթռալ"</item>
-  </string-array>
-  <string-array name="apn_auth_entries">
-    <item msgid="3856896061242872146">"Ոչ մեկը"</item>
-    <item msgid="5756844015743664882">"PAP"</item>
-    <item msgid="535934025797984365">"CHAP"</item>
-    <item msgid="8383098660619805783">"PAP կամ CHAP"</item>
-  </string-array>
-  <string-array name="apn_protocol_entries">
-    <item msgid="4852355456199302715">"IPv4"</item>
-    <item msgid="4394161344888484571">"IPv6"</item>
-    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
-  </string-array>
-  <string-array name="bearer_entries">
-    <item msgid="1770285336669531300">"LTE"</item>
-    <item msgid="3044323519470167625">"eHRPD"</item>
-    <item msgid="6848428671997893147">"Տարբերակված չէ"</item>
-  </string-array>
-  <string-array name="mvno_type_entries">
-    <item msgid="4367119357633573465">"Ոչ մեկը"</item>
-    <item msgid="6062567900587138000">"SPN"</item>
-    <item msgid="2454085083342423481">"IMSI"</item>
-    <item msgid="2681427309183221543">"GID"</item>
-  </string-array>
-  <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"Սարքի ներքին պահոց"</item>
-    <item msgid="3738430123799803530">"Շարժական SD քարտ"</item>
-    <item msgid="4498124044785815005">"Թույլատրել համակարգը որոշի"</item>
-  </string-array>
-  <string-array name="app_ops_categories">
-    <item msgid="6358963769537892925">"Տեղադրություն"</item>
-    <item msgid="255608127647030286">"Անձնական"</item>
-    <item msgid="4588829735729884491">"Հաղորդակցում"</item>
-    <item msgid="886742181977884584">"Մեդիա"</item>
-    <item msgid="7924928667052300589">"Սարք"</item>
-  </string-array>
-  <string-array name="app_ops_summaries">
-    <item msgid="4979188868761515915">"հենակետային տեղանք"</item>
-    <item msgid="5789673140227507995">"ճշգրիտ տեղադրություն"</item>
-    <item msgid="1061584358377390581">"GPS"</item>
-    <item msgid="5387405117297558954">"թրթռալ"</item>
-    <item msgid="3434165993711230924">"տեսնել կոնտակտների ցանկը"</item>
-    <item msgid="616161687718081936">"փոփոխել կոնտակտների ցանկը"</item>
-    <item msgid="7638002295329050091">"տեսնել զանգերի մատյանը"</item>
-    <item msgid="6546959730920410907">"փոփոխել զանգերի մատյանը"</item>
-    <item msgid="446877710771379667">"կարդալ օրացույցը"</item>
-    <item msgid="7674458294386319722">"փոփոխել օրացույցը"</item>
-    <item msgid="8281201165558093009">"wi-fi սկանավորում"</item>
-    <item msgid="8694611243479480497">"ծանուցում"</item>
-    <item msgid="7776439107987345446">"բջջային սկանավորում"</item>
-    <item msgid="514615766544675057">"Հեռախոսահամար"</item>
-    <item msgid="8181415497109310680">"կարդալ SMS-ը"</item>
-    <item msgid="6816551144382117307">"գրել SMS"</item>
-    <item msgid="4600463921908905030">"ստանալ SMS"</item>
-    <item msgid="5958926493289432745">"ստանալ արտակարգ իրավիճակների SMS-ներ"</item>
-    <item msgid="4945269495221089540">"ստանալ MMS"</item>
-    <item msgid="5570472453573929087">"ստանալ WAP սեղմում"</item>
-    <item msgid="7125408150230860501">"ուղարկել SMS"</item>
-    <item msgid="7080337936612188061">"կարդալ ICC SMS"</item>
-    <item msgid="587124103118495063">"գրել ICC SMS"</item>
-    <item msgid="2320577158869025503">"փոփոխել կարգավորումները"</item>
-    <item msgid="1545733463471924009">"պատկերել վերին մասում"</item>
-    <item msgid="3609046903962454582">"մուտք գործել ծանուցումներ"</item>
-    <item msgid="4671646036128214513">"ֆոտոխցիկ"</item>
-    <item msgid="1097324338692486211">"ձայնագրել ձայնանյութ"</item>
-    <item msgid="5031552983987798163">"նվագարկել ձայնանյութը"</item>
-    <item msgid="8374996688066472414">"կարդալ սեղմատախտակը"</item>
-    <item msgid="3045529469061083747">"փոփոխել սեղմատախտակը"</item>
-    <item msgid="5124443975763747838">"մեդիա կոճակներ"</item>
-    <item msgid="4547883971364273343">"աուդիո ֆոկուս"</item>
-    <item msgid="2603878814882344450">"ձայնի հիմնական բարձրություն"</item>
-    <item msgid="7136963238377062018">"ձայնի բարձրություն"</item>
-    <item msgid="4270236897655923007">"զանգի բարձրություն"</item>
-    <item msgid="6325739889222559394">"մեդիանյութերի ձայնի բարձրություն"</item>
-    <item msgid="5762123934816216821">"զարթուցիչի ձայնի բարձրություն"</item>
-    <item msgid="785049718065337473">"ծանուցման ձայնի բարձրություն"</item>
-    <item msgid="6700305533746877052">"bluetooth-ի ձայնի բարձրություն"</item>
-    <item msgid="2029227495214047094">"արթուն պահել"</item>
-    <item msgid="26109888160231211">"վերահսկել տեղադրությունը"</item>
-    <item msgid="5753382310468855812">"մշտադիտարկել էներգատար տեղանքները"</item>
-  </string-array>
-  <string-array name="app_ops_labels">
-    <item msgid="6602854600289714121">"Տեղակայում"</item>
-    <item msgid="8677040780775113033">"Տեղադրություն"</item>
-    <item msgid="1660743989948992916">"Տեղադրություն"</item>
-    <item msgid="8791172739860195290">"Թրթռալ"</item>
-    <item msgid="383413555642128046">"Տեսնել կոնտակտները"</item>
-    <item msgid="3654594895269697313">"Փոփոխել կոնտակտները"</item>
-    <item msgid="7928393476362362538">"Տեսնել զանգերի մատյանը"</item>
-    <item msgid="6248591205254641116">"Փոփոխել զանգերի մատյանը"</item>
-    <item msgid="6093344633066170692">"Տեսնել օրացույցը"</item>
-    <item msgid="1334886368750347692">"Փոփոխել օրացույցը"</item>
-    <item msgid="1638204101698708656">"Տեղադրություն"</item>
-    <item msgid="2154671955760380322">"Փակցնել ծանուցում"</item>
-    <item msgid="4282477730595931828">"Տեղադրություն"</item>
-    <item msgid="4891423912898525905">"Հեռախոս"</item>
-    <item msgid="2623604824935968113">"Կարդալ SMS/MMS"</item>
-    <item msgid="4420177125221176306">"Գրել SMS/MMS"</item>
-    <item msgid="3986142739951490025">"Ստանալ SMS/MMS"</item>
-    <item msgid="3984213795861739778">"Ստանալ SMS/MMS"</item>
-    <item msgid="3656243523752472788">"Ստանալ SMS/MMS"</item>
-    <item msgid="8105802370238551510">"Ստանալ SMS/MMS"</item>
-    <item msgid="1407766984645388488">"Ուղարկել SMS/MMS"</item>
-    <item msgid="3527273606643794973">"Կարդալ SMS/MMS"</item>
-    <item msgid="4370895547001583812">"Գրել SMS/MMS"</item>
-    <item msgid="4218544235221631789">"Փոփոխել կարգավորումները"</item>
-    <item msgid="736541391767350377">"Պատկերել վերևի մասում"</item>
-    <item msgid="5530815681721654194">"Մուտք գործել ծանուցումներ"</item>
-    <item msgid="781213371706962767">"Ֆոտոխցիկ"</item>
-    <item msgid="1720492593061838172">"Ձայնագրել ձայնանյութ"</item>
-    <item msgid="3493046322001257041">"Նվագարկել ձայնանյութը"</item>
-    <item msgid="136815868796597058">"Կարդալ սեղմատախտակը"</item>
-    <item msgid="5238692940326972503">"Փոփոխել սեղմատախտակը"</item>
-    <item msgid="5753789168376302997">"Մեդիա կոճակներ"</item>
-    <item msgid="3265262911688671938">"Աուդիո ֆոկուս"</item>
-    <item msgid="2098976479485046797">"Ձայնի հիմնական բարձրություն"</item>
-    <item msgid="5660213838861789350">"Ձայնի բարձրություն"</item>
-    <item msgid="7983336752371254444">"Զանգի բարձրություն"</item>
-    <item msgid="7878027809189330917">"Մեդիանյութերի ձայնի բարձրություն"</item>
-    <item msgid="7260546305036218513">"Զարթուցիչի ձայնի բարձրություն"</item>
-    <item msgid="9103719301075748925">"Ծանուցման ձայնի բարձրություն"</item>
-    <item msgid="7025966722295861512">"Bluetooth-ի ձայնի բարձրություն"</item>
-    <item msgid="4665183401128289653">"Արթուն պահել"</item>
-    <item msgid="8584357129746649222">"Տեղադրություն"</item>
-    <item msgid="7669257279311110599">"Տեղադրություն"</item>
-  </string-array>
-  <string-array name="long_press_timeout_selector_titles">
-    <item msgid="3511504869290423954">"Կարճաժամկետ"</item>
-    <item msgid="2560532955514699713">"Միջին"</item>
-    <item msgid="2372711992605524591">"Երկար"</item>
-  </string-array>
-  <string-array name="captioning_typeface_selector_titles">
-    <item msgid="1319652728542138112">"Լռելյայն"</item>
-    <item msgid="1016452621833735880">"Sans-serif"</item>
-    <item msgid="2496277987934654454">"Sans-serif խտացրած"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Առօրյա"</item>
-    <item msgid="961716102408512888">"Ձեռագիր"</item>
-    <item msgid="784581717183349567">"Փոքր մեծատառեր"</item>
-  </string-array>
-  <string-array name="captioning_font_size_selector_titles">
-    <item msgid="4800919809575254054">"Շատ փոքր"</item>
-    <item msgid="6781094565687692782">"Փոքր"</item>
-    <item msgid="8222123259497646551">"Սովորական"</item>
-    <item msgid="5813217276778560466">"Մեծ"</item>
-    <item msgid="9044232017390975191">"Շատ մեծ"</item>
-  </string-array>
-  <string-array name="captioning_edge_type_selector_titles">
-    <item msgid="6022616153255438487">"Ոչինչ"</item>
-    <item msgid="1352974708028506778">"Ուրվագիծ"</item>
-    <item msgid="5850876295428722675">"Ստվեր"</item>
-    <item msgid="4620283365518546731">"Ուռուցիկ"</item>
-    <item msgid="6395808180998856466">"Ճնշված"</item>
-  </string-array>
-  <string-array name="captioning_opacity_selector_titles">
-    <item msgid="7622491218136667566">"25%"</item>
-    <item msgid="2367156416247936773">"50%"</item>
-    <item msgid="5395560410107149298">"75%"</item>
-    <item msgid="8342334626783983353">"100%"</item>
-  </string-array>
-  <string-array name="captioning_preset_selector_titles">
-    <item msgid="1630625150404038035">"Սպիտակը սևի վրա"</item>
-    <item msgid="4589278788192525675">"Սևը սպիտակի վրա"</item>
-    <item msgid="1309255027325660115">"Դեղինը սևի վրա"</item>
-    <item msgid="2985943780939258562">"Դեղինը կապույտի վրա"</item>
-    <item msgid="7520438652121629055">"Հատուկ"</item>
-  </string-array>
-  <string-array name="select_runtime_titles">
-    <item msgid="3574453009229338122">"Dalvik"</item>
-    <item msgid="8978402910750533864">"ART"</item>
-    <item msgid="7839859333977894115">"ART (վրիպազերծում)"</item>
-  </string-array>
-  <string-array name="select_runtime_summaries">
-    <item msgid="6412880178297884701">"Օգտագործել Dalvik"</item>
-    <item msgid="5131846588686178907">"Օգտագործել ART"</item>
-    <item msgid="4530003713865319928">"Օգտագործել ART վրիպազերծման ծրագրատարբերակը"</item>
-  </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Երբեք չստուգել"</item>
-    <item msgid="6042769699089883931">"Ստուգել միայն DRM բովանդակությունը"</item>
-    <item msgid="9174900380056846820">"Միշտ ստուգել"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"Երբեք չօգտագործել HDCP ստուգումը"</item>
-    <item msgid="3878793616631049349">"Օգտագործել HDCP-ը` միայն DRM-ի բովանդակությունը ստուգելու համար"</item>
-    <item msgid="45075631231212732">"Միշտ օգտագործել HDCP ստուգումը"</item>
-  </string-array>
-  <string-array name="window_animation_scale_entries">
-    <item msgid="8134156599370824081">"Անջատել շարժապատկերը"</item>
-    <item msgid="6624864048416710414">"Շարժապատկերի սանդղակը` .5x"</item>
-    <item msgid="2219332261255416635">"Շարժապատկերի սանդղակը` 1x"</item>
-    <item msgid="3544428804137048509">"Շարժապատկերի սանդղակը` 1.5x"</item>
-    <item msgid="3110710404225974514">"Շարժապատկերի սանդղակը` 2x"</item>
-    <item msgid="4402738611528318731">"Շարժապատկերի սանդղակը` 5x"</item>
-    <item msgid="6189539267968330656">"Շարժապատկերի սանդղակը` 10x"</item>
-  </string-array>
-  <string-array name="transition_animation_scale_entries">
-    <item msgid="8464255836173039442">"Անջատել շարժապատկերը"</item>
-    <item msgid="3375781541913316411">"Շարժապատկերի սանդղակը` .5x"</item>
-    <item msgid="1991041427801869945">"Շարժապատկերի սանդղակը` 1x"</item>
-    <item msgid="4012689927622382874">"Շարժապատկերի սանդղակը` 1.5x"</item>
-    <item msgid="3289156759925947169">"Շարժապատկերի սանդղակը` 2x"</item>
-    <item msgid="7705857441213621835">"Շարժապատկերի սանդղակը` 5x"</item>
-    <item msgid="6660750935954853365">"Շարժապատկերի սանդղակը` 10x"</item>
-  </string-array>
-  <string-array name="animator_duration_scale_entries">
-    <item msgid="6039901060648228241">"Անջատել շարժապատկերը"</item>
-    <item msgid="1138649021950863198">"Շարժապատկերի սանդղակը .5x"</item>
-    <item msgid="4394388961370833040">"Շարժապատկերի սանդղակը` 1x"</item>
-    <item msgid="8125427921655194973">"Շարժապատկերի սանդղակը 1.5x"</item>
-    <item msgid="3334024790739189573">"Շարժապատկերի սանդղակը` 2x"</item>
-    <item msgid="3170120558236848008">"Շարժանկարի սանդղակը` 5x"</item>
-    <item msgid="1069584980746680398">"Շարժապատկերի սանդղակը` 10x"</item>
-  </string-array>
-  <string-array name="overlay_display_devices_entries">
-    <item msgid="1606809880904982133">"Ոչ մեկը"</item>
-    <item msgid="688482401508173818">"720x480 mdpi"</item>
-    <item msgid="6027541158956821790">"720x480 mdpi (անվտանգ)"</item>
-    <item msgid="8181151155909301030">"1280x720 tvdpi"</item>
-    <item msgid="2920655562462493148">"1280x720 tvdpi (անվտանգ)"</item>
-    <item msgid="8910371271391940941">"1920x1080 xhdpi"</item>
-    <item msgid="4171600481380800455">"1920x1080 xhdpi (անվտանգ)"</item>
-    <item msgid="1937752114395156918">"1280x720 tvdpi և 1920x1080 xhdpi"</item>
-  </string-array>
-  <string-array name="enable_opengl_traces_entries">
-    <item msgid="3191973083884253830">"Ոչ մեկը"</item>
-    <item msgid="9089630089455370183">"Logcat"</item>
-    <item msgid="5397807424362304288">"Համակարգային հետագիծ (գծապատկերներ)"</item>
-    <item msgid="1340692776955662664">"Կանչել glGetError-ի կույտը"</item>
-  </string-array>
-  <string-array name="show_non_rect_clip_entries">
-    <item msgid="993742912147090253">"Անջատված"</item>
-    <item msgid="675719912558941285">"Ներկել ոչ ուղղանկյունային կտրվածքի տարածքը կապույտով"</item>
-    <item msgid="1064373276095698656">"Փորձարկված թեստի գունանշումը կանաչով"</item>
-  </string-array>
-  <string-array name="track_frame_time_entries">
-    <item msgid="2193584639058893150">"Անջատել"</item>
-    <item msgid="2751513398307949636">"Էկրանի վրա որպես գոտիներ"</item>
-    <item msgid="8272260411216018353">"Էկրանի վրա որպես գծեր"</item>
-    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo-ում"</item>
-  </string-array>
-  <string-array name="debug_hw_overdraw_entries">
-    <item msgid="8190572633763871652">"Անջատված է"</item>
-    <item msgid="7688197031296835369">"Ցույց տալ գերազանցված հատվածները"</item>
-    <item msgid="2290859360633824369">"Ցույց տալ դալտոնիզմի ոլորտները"</item>
-    <item msgid="3448087929560624983">"Ցույց տալ գերազանցման հաշվիչը"</item>
-  </string-array>
-  <string-array name="app_process_limit_entries">
-    <item msgid="3401625457385943795">"Սովորական սահման"</item>
-    <item msgid="4071574792028999443">"Հետնաշերտում գործողություններ չկան"</item>
-    <item msgid="4810006996171705398">"Առավելագույնը 1 գործընթաց"</item>
-    <item msgid="8586370216857360863">"Առավելագույնը 2 գործընթաց"</item>
-    <item msgid="836593137872605381">"Առավելագույնը 3  գործընթաց"</item>
-    <item msgid="7899496259191969307">"Ամենաշատը 4 գործընթաց"</item>
-  </string-array>
-  <string-array name="vpn_types_long">
-    <item msgid="2732002039459078847">"PPTP VPN"</item>
-    <item msgid="3799752201662127867">"L2TP/IPSec VPN նախորոշված ստեղներով"</item>
-    <item msgid="4725504331295252103">"L2TP/IPSec VPN վկայագրերով"</item>
-    <item msgid="7526551163264034377">"IPSec VPN նախորոշված ստեղներով և Xauth նույնականացմամբ"</item>
-    <item msgid="8064740940687465039">"IPSec VPN վկայականներով և Xauth նույնականացմամբ"</item>
-    <item msgid="4946199982372391490">"IPSec VPN վկայագրերով և խառնածին նույնականացմամբ"</item>
-  </string-array>
-  <string-array name="vpn_states">
-    <item msgid="8621078286418985762">"Անջատված"</item>
-    <item msgid="6692305604213080515">"Նախապատրաստվում է..."</item>
-    <item msgid="8001704909356800092">"Միանում է..."</item>
-    <item msgid="4039737283841672166">"Միացված է"</item>
-    <item msgid="4042143101664725090">"Ժամանակի սպառում"</item>
-    <item msgid="7664124146786465092">"Անհաջող"</item>
-  </string-array>
-  <string-array name="security_settings_premium_sms_values">
-    <item msgid="7389829271787670252">"Հարցնել"</item>
-    <item msgid="5077768429488260031">"Երբեք չթույլատրել"</item>
-    <item msgid="1417929597727989746">"Միշտ թույլատրել"</item>
-  </string-array>
-  <string-array name="ram_states">
-    <item msgid="7088762389498381203">"նորմալ"</item>
-    <item msgid="4517779899383204000">"չափավոր"</item>
-    <item msgid="406385694840950802">"ցածր"</item>
-    <item msgid="4212263919458209842">"կրիտիկական"</item>
-  </string-array>
-  <string-array name="inversion_type_entries">
-    <item msgid="9312912686075064">"Սովորական"</item>
-    <item msgid="7316546394967864094">"Միայն գուներանգ"</item>
-    <item msgid="5385613066929784179">"Միայն պայծառություն"</item>
-  </string-array>
-</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 0369281..2461d46 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Անհայտ սխալ"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Սառը"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Տեսանելի դառնալ մոտակայքում գտնվող բոլոր Bluetooth սարքերին (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Տեսանելի է մոտ գտնվող բոլոր Bluetooth սարքերին"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Տեսանելի չէ այլ Bluetooth սարքերին"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Միայն զուգավորված սարքերի համար տեսանելի"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Ընդունվում են զուգավորման հարցումներ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Ընդունվում են զուգավորման հարցումներ"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Զուգավորման հարցումներ չեն ընդունվում"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Զուգավորման հարցումներ չեն ընդունվում"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Տեսանելիության ժամանակի սպառում"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Կողպել ձայնային համարհավաքումը"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Կանխել Bluetooth համարհավաքչի օգտագործումը, երբ էկրանը կողպված է"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Անջատե՞լ"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Սա կավարտի կապը &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&amp;gt-ի հետ"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Հեռարձակում"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"Միացված"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Անջատված"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Կասեցնե՞լ պրոֆիլը:"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Սա կանջատի:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;-ը :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;-ից"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Միացված է"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Ձեր հեռախոսի ծրագրերից մեկը թույլտվություն է հայցում` ձեր հեռախոսը հայտնաբերելի դարձնելու այլ Bluetooth սարքերի կողմից <xliff:g id="TIMEOUT">%1$d</xliff:g> վայրկյանից:"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Ծրագիրը ցանկանում է միացնել Bluetooth-ը և ձեր գրասալիկը տեսանելի դարձնել մյուս սարքերի համար: Դուք կարող եք այն փոխել հետագայում Bluetooth-ի կարգավորումներում:"</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Ծրագիրը ցանկանում է ձեր հեռախոսը տեսանելի դարձնել այլ Bleutooth սարքերի համար: Դուք կարող եք փոխել դա հետագայում Bluetooth կարգավորորւմներում:"</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ն ուզում է միացնել Bluetooth հեռարձակումը՝ մոտակա սարքերի հետ հաղորդակցվելու համար: Դուք կարող եք ավելի ուշ փոխել սա Bluetooth-ի կարգավորումներում:"</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ն ուզում է միացնել Bluetooth-ը և Bluetooth հեռարձակումը՝ մոտակա սարքերի հետ հաղորդակցվելու համար: Դուք կարող եք ավելի ուշ փոխել սա Bluetooth-ի կարգավորումներում:"</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Երբ այս հնարավորությունը միացված է, և ձեր հեռախոսը կարող է հաղորդակցվել մոտակա այլ սարքերի հետ:\n\nՀեռարձակումն օգտագործում է ցածր էներգիայի Bluetooth ազդանշաններ:"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Ծրագիրը ցանկանում է միացնել Bluetooth-ը և ձեր գրասալիկը տեսանելի դարձնել այլ սարքերի կողմից <xliff:g id="TIMEOUT">%1$d</xliff:g> վայրկյանից:"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Հավելվածը ցանկանում է միացնել Bluetooth-ը և տեսանելի դարձնել ձեր հեռախոսը այլ սարքերի համար <xliff:g id="TIMEOUT">%1$d</xliff:g> վայրկյանի ընթացքում:"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Ծրագիրը ցանկանում է միացնել Bluetooth-ը` ձեր գրասալիկը մյուս սարքերին տեսանելի դարձնելու համար: Դուք կարող եք փոխել այն հետագայում Bluetooth-ի կարգավորումներում:"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Ծրագիրը ցանկանում է միացնել Bluetooth-ը` ձեր հեռախոսը մյուս սարքերին տեսանելի դարձնելու համար: Դուք կարող եք փոխել այն հետագայում Bluetooth-ի կարգավորումներում:"</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ն ուզում է միացնել Bluetooth հեռարձակումը՝ մոտակա սարքերի հետ հաղորդակցվելու համար: Դուք կարող եք ավելի ուշ փոխել սա Bluetooth-ի կարգավորումներում:"</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ը ցանկանում է միացնել Bluetooth-ը և Bluetooth հեռարձակումը՝ մոտակա սարքերի հետ հաղորդակցվելու համար: Դուք կարող եք ավելի ուշ փոխել սա Bluetooth-ի կարգավորումներում:"</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Երբ այս հնարավորությունը միացված է, և ձեր հեռախոսը կարող է հաղորդակցվել մոտակա այլ սարքերի հետ:\n\nՀեռարձակումն օգտագործում է ցածր էներգիայի Bluetooth ազդանշաններ:"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth-ը միանում է..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth-ն անջատվում է...."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Ինքուրույն միացնել"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Ձայնային զանգեր"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Գրասալիկի անգործունը"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Հեռախոսի անգործունը"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Չհաշվարկված"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Գերօգտագործում"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-ի ընդհանուրը"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU առաջնատեսք"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Արթուն պահել"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Տեսանյութ"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Ժամանակը միացման պահից"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Ժամանակը առանց ազդանշանի"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Մարտկոցի ընդհանուր հզորություն"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Մարտկոցի օգտագործում"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Նվազագույն իրական սնուցում"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Առավելագույն իրական սնուցում"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Ստիպողաբար դադարեցնել"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Ծրագրի տեղեկությունները"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Հավելվածի կարգավորումներ"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Ընտրեք մարտկոցը խնայող ռեժիմ"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Հավելվածը կարող է առաջարկել կարգավորումներ` մարտկոցի օգտագործումը նվազեցնելու համար"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Օգտվողի կողմից օգտագործված մարտկոցը"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Մարտկոցի չհաշվարկված օգտագործում"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Մարտկոցի գերօգտագործում"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> հոսանքից անջատելուց հետո"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Մինչ <xliff:g id="UNPLUGGED">%1$s</xliff:g>-ի վերջին անջատումը"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Ընդհանուր օգտագործումը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 692a325..7d66b0f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Kesalahan tidak dikenal"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Dingin"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Terlihat utk semua perangkat Bluetooth terdekat (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Terlihat untuk semua perangkat Bluetooth terdekat"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Tidak terlihat oleh perangkat Bluetooth lain"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Hanya terlihat oleh perangkat yang disandingkan"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Batas waktu keterlihatan"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Kunci pemanggilan suara"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Mencegah penggunaan aplikasi telepon Bluetooth ketika layar terkunci"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Putuskan sambungan?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ini akan mengakhiri sambungan Anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Penyiaran"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Nonaktifkan profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Ini akan menonaktifkan:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Terhubung"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Sebuah aplikasi ingin menampilkan ponsel Anda pada perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Sebuah aplikasi ingin menampilkan ponsel Anda di perangkat Bluetooth lain. Anda dapat mengubah ini nanti di setelan Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Sebuah aplikasi ingin menampilkan ponsel Anda di perangkat Bluetooth lain. Anda dapat mengubah ini nanti di setelan Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan penyiaran Bluetooth untuk berkomunikasi dengan perangkat di sekitar. Anda dapat mengubahnya nanti di setelan Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan Bluetooth dan penyiaran Bluetooth untuk berkomunikasi dengan perangkat di sekitar. Anda dapat mengubahnya nanti di setelan Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Saat fitur ini diaktifkan, ponsel Anda dapat berkomunikasi dengan perangkat di sekitar.\n\nPenyiaran menggunakan sinyal Bluetooth daya rendah."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Sebuah aplikasi ingin mengaktifkan Bluetooth dan menampilkan tablet Anda di perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Sebuah aplikasi ingin mengaktifkan Bluetooth dan menampilkan ponsel Anda di perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Sebuah aplikasi ingin mengaktifkan Bluetooth dan menampilkan tablet Anda di perangkat lain. Anda dapat mengubah ini nanti di setelan Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Sebuah aplikasi ingin mengaktifkan Bluetooth dan menampilkan ponsel Anda di perangkat lain. Anda dapat mengubah ini nanti di setelan Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan penyiaran Bluetooth untuk berkomunikasi dengan perangkat di sekitar. Anda dapat mengubahnya nanti di setelan Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Saat fitur ini diaktifkan, ponsel Anda dapat berkomunikasi dengan perangkat di sekitar.\n\nPenyiaran menggunakan sinyal Bluetooth daya rendah."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Menyalakan Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Mematikan Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Sambung-otomatis"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Panggilan suara"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet menganggur"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telepon menganggur"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Tidak terhitung"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Dihitung berlebih"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Tetap aktif"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Waktu hidup"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Waktu tanpa sinyal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Kapasitas total baterai"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Daya yang dihitung"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Daya minimum sebenarnya"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Daya maksimum sebenarnya"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Paksa berhenti"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Info apl"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Setelan apl"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pilih mode hemat baterai"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Apl tersebut mungkin menawarkan setelan untuk mengurangi penggunaan baterai"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterai yang digunakan oleh pengguna"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Penggunaan daya yang tidak terhitung"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan daya yang dihitung berlebih"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak dicabut"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ketika terakhir dicabut untuk <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total penggunaan"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a11a1c4..7934e0b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Errore sconosciuto"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Minimo"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visibile a tutti dispositivi Bluetooth vicini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visibile a tutti dispositivi Bluetooth vicini"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Non visibile ad altri dispositivi Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visibile solo ai dispositivi accoppiati"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Accettazione delle richieste di accoppiamento (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Accettazione delle richieste di accoppiamento"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Rifiuto delle richieste di accoppiamento"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Rifiuto delle richieste di accoppiamento"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout visibilità"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Blocca composizione vocale"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedisci l\'uso del compositore Bluetooth quando lo schermo è bloccato"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnettere?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Questa operazione terminerà la connessione con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Trasmissione"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"Attiva"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Non attiva"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disattivare il profilo?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Verrà disattivato:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connesso"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Un\'app chiede di rendere il telefono visualizzabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Un\'app chiede di rendere il tablet visualizzabile da altri dispositivi Bluetooth. Puoi modificare questa impostazione in seguito nelle impostazioni Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Un\'app chiede di rendere il telefono visualizzabile da altri dispositivi Bluetooth. Puoi modificare questa impostazione in seguito nelle impostazioni Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> desidera attivare la trasmissione via Bluetooth per comunicare con altri dispositivi nelle vicinanze. Puoi modificare tale impostazione in un secondo momento nelle impostazioni relative al Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> desidera attivare la funzione Bluetooth e la trasmissione via Bluetooth per comunicare con altri dispositivi nelle vicinanze. Puoi modificare tale impostazione in un secondo momento nelle impostazioni relative al Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Quando questa funzione è attiva, il telefono può comunicare con altri dispositivi nelle vicinanze.\n\nLa trasmissione utilizza segnali Bluetooth a bassa potenza."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Un\'app chiede di attivare il Bluetooth e di rendere il tablet visualizzabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Un\'app chiede di attivare il Bluetooth e di rendere il telefono visualizzabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Un\'app chiede di attivare il Bluetooth e di rendere il tablet visualizzabile da altri dispositivi. Puoi modificare questa impostazione in seguito nelle impostazioni Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Un\'app chiede di attivare il Bluetooth e di rendere il telefono visualizzabile da altri dispositivi. Puoi modificare questa impostazione in seguito nelle impostazioni Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> desidera attivare la trasmissione via Bluetooth per comunicare con altri dispositivi nelle vicinanze. Puoi modificare tale impostazione in un secondo momento nelle impostazioni relative al Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"<xliff:g id="APP_NAME">%1$s</xliff:g> desidera attivare la funzione Bluetooth e la trasmissione via Bluetooth per comunicare con altri dispositivi nelle vicinanze. Puoi modificare tale impostazione in un secondo momento nelle impostazioni Bluetooth."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Quando questa funzione è attiva, il telefono può comunicare con altri dispositivi nelle vicinanze.\n\nLa trasmissione utilizza segnali Bluetooth a bassa potenza."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Attivazione Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Disattivazione Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connessione automatica"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Chiamate vocali"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inattivo"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefono inattivo"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Non considerato"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Sovrastimato"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Totale CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU in primo piano"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantieni attivo"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tempo in attività"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tempo trascorso senza segnale"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Capacità totale batteria"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Consumo calcolato"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Consumo effettivo min"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Consumo effettivo max"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Termina"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informazioni applicazione"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Impostazioni applicazioni"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Seleziona modalità a basso consumo"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'applicazione potrebbe offrire impostazioni per ridurre l\'utilizzo della batteria"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batteria utilizzata dall\'utente"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consumo batteria non considerato"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo batteria sovrastimato"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> dallo scollegamento"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Durante ultimo scollegamento per <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totali utilizzo"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 06d1a3b..dcbffa5 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"שגיאה לא מוכרת"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"קר"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"‏גלוי לכל מכשירי Bluetooth הסמוכים (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"‏גלוי לכל מכשירי Bluetooth הסמוכים"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"‏לא גלוי עבור מכשירי Bluetooth אחרים"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"גלוי רק למכשירים מותאמים"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"מקבל בקשות התאמה (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"מקבל בקשות התאמה"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"לא מקבל בקשות התאמה"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"לא מקבל בקשות התאמה"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"זמן קצוב לחשיפה"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"נעל חיוג קולי"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"‏מנע את השימוש בחייגן Bluetooth כאשר המסך נעול"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"להתנתק?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏פעולה זו תסיים את החיבור עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"שידור"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"פועל"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"כבוי"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"להשבית פרופיל?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"‏פעולה זו תשבית את:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;מ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"מחובר"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"‏אפליקציה מסוימת רוצה להפוך את הטלפון שלך לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"‏אפליקציה מסוימת רוצה להפוך את הטאבלט שלך לגלוי בפני מכשירי Bluetooth אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth"</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"‏אפליקציה מסוימת רוצה להפוך את הטלפון שלך לגלוי בפני מכשירי Bluetooth אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth"</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"‏<xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל שידור ב-Bluetooth כדי לתקשר עם מכשירים קרובים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"‏<xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל Bluetooth ושידור ב-Bluetooth כדי לתקשר עם מכשירים קרובים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"‏כשהתכונה הזו פועלת, הטלפון יכול לתקשר עם מכשירים קרובים אחרים.\n\nהשידור מתבצע באמצעות אותות Bluetooth בעוצמה חלשה."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"‏אפליקציה מסוימת רוצה להפעיל את ה-Bluetooth ולהפוך את הטאבלט שלך לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"‏אפליקציה מסוימת רוצה להפעיל את ה-Bluetooth ולהפוך את הטלפון שלך לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"‏אפליקציה מסוימת רוצה להפעיל את ה-Bluetooth ולהפוך את הטאבלט שלך לגלוי בפני מכשירים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"‏אפליקציה מסוימת רוצה להפעיל את ה-Bluetooth ולהפוך את הטלפון שלך לגלוי בפני מכשירים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"‏<xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל שידור ב-Bluetooth כדי לתקשר עם מכשירים קרובים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"‏<xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל Bluetooth ושידור ב-Bluetooth כדי לתקשר עם מכשירים קרובים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות Bluetooth."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"‏כשהתכונה הזו פועלת, הטלפון יכול לתקשר עם מכשירים קרובים אחרים.\n\nהשידור מתבצע באמצעות אותות Bluetooth בעוצמה חלשה."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"‏מפעיל Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"‏Bluetooth נכבה…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"חיבור אוטומטי"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"שיחות קוליות"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"טאבלט לא פעיל"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"טלפון לא פעיל"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"לא מוסבר"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"חישוב יתר"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"‏CPU - סך הכל"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU בחזית"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"שמור במצב פעיל"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"‏Google וידאו"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"משך פעולה עד כה"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"זמן ללא אות"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"קיבולת סוללה כוללת"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"שימוש מחושב בחשמל"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"עוצמת חשמל מינימלית בפועל"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"עוצמת חשמל מקסימלית בפועל"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"אלץ עצירה"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"פרטי אפליקציה"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"הגדרות אפליקציה"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"בחר במצב חיסכון בסוללה"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ייתכן שהאפליקציה מציעה הגדרות לצמצום צריכת הסוללה"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"סוללה בשימוש על ידי משתמש"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"שימוש לא מוסבר בחשמל"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"חישוב יתר של שימוש בחשמל"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> מיליאמפר לשעה"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> מאז הניתוק"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"מאז הניתוק האחרון למשך <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"נתוני שימוש כוללים"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b65fcec..fae01dc 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -112,10 +112,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"不明なエラー"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"低温"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"周辺のすべてのBluetoothデバイスに表示（<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>）"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"周辺のすべてのBluetoothデバイスに表示"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"他のBluetoothデバイスには非表示"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ペア設定したデバイスにのみ表示"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"表示のタイムアウト"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ボイスダイヤルをロック"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"画面がロックされているときはBluetoothボイスダイヤルを使用しない"</string>
@@ -131,6 +135,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"切断しますか？"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"この操作を行うと、次のデバイスとの接続が切断されます:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ブロードキャスト"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"プロフィールを無効にしますか？"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"次のプロフィールが無効になります:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;対象デバイス:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"接続"</string>
@@ -157,13 +165,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスにこの携帯端末を表示しようとしています。"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"アプリが他のBluetoothデバイスにこのタブレットを表示しようとしています。これは後からBluetoothの設定で変更できます。"</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"アプリが他のBluetoothデバイスにこの携帯端末を表示しようとしています。これは後からBluetoothの設定で変更できます。"</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>がBluetoothブロードキャストをONにして付近の他のデバイスと通信しようとしています。これは後からBluetoothの設定で変更できます。"</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g>がBluetoothとBluetoothブロードキャストをONにして付近の他のデバイスと通信しようとしています。これは後からBluetoothの設定で変更できます。"</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"この機能をONにすると、端末が付近の他のデバイスと通信できるようになります。\n\nブロードキャストでは省電力のBluetooth信号を使用します。"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間BluetoothをONにして他のデバイスにこのタブレットを表示しようとしています。"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間BluetoothをONにして他のデバイスにこの携帯端末を表示しようとしています。"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"アプリがBluetoothをONにして他のデバイスにこのタブレットを表示しようとしています。これは後からBluetoothの設定で変更できます。"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"アプリがBluetoothをONにして他のデバイスにこの携帯端末を表示しようとしています。これは後からBluetoothの設定で変更できます。"</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>がBluetoothブロードキャストをONにして付近の他のデバイスと通信しようとしています。これは後からBluetoothの設定で変更できます。"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"この機能をONにすると、端末が付近の他のデバイスと通信できるようになります。\n\nブロードキャストでは省電力のBluetooth信号を使用します。"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"BluetoothをONにしています..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"BluetoothをOFFにしています..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"自動接続"</string>
@@ -1513,6 +1520,8 @@
     <string name="power_phone" msgid="5392641106474567277">"通話"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"アイドル状態"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"アイドル状態"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"算出不能"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"過剰算出"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU合計"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUフォアグラウンド"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"スリープモードにしない"</string>
@@ -1528,6 +1537,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"動画"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"点灯時間"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"圏外時間"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"電池の合計容量"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"算出された電力"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"実際の最小電力"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"実際の最大電力"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"強制停止"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"アプリ情報"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"アプリの設定"</string>
@@ -1551,6 +1564,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"バッテリー節約モードを選択します"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"アプリ側の設定で電池使用量を抑えられる場合があります"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ユーザーの電池使用量"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"算出不能の消費電力"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"過剰算出された消費電力"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"電池使用時間: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"電池使用時間: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"合計使用量"</string>
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka-rGE/arrays.xml
deleted file mode 100644
index 6dd38e1..0000000
--- a/res/values-ka-rGE/arrays.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-**
-** Copyright 2007 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.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="timezone_filters">
-    <item msgid="5296756001147094692">"ამერიკა"</item>
-    <item msgid="3005562397632768392">"ევროპა"</item>
-    <item msgid="5696915123093701218">"აფრიკა"</item>
-    <item msgid="4439789052790868249">"აზია"</item>
-    <item msgid="956915953069815961">"ავსტრალია"</item>
-    <item msgid="5345178126174698955">"წყნარი ოკეანის"</item>
-    <item msgid="8392017019801393511">"ყველა"</item>
-  </string-array>
-  <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 წამი"</item>
-    <item msgid="8881760709354815449">"30 წამი"</item>
-    <item msgid="7589406073232279088">"1 წუთი"</item>
-    <item msgid="7001195990902244174">"2 წუთი"</item>
-    <item msgid="7489864775127957179">"5 წუთი"</item>
-    <item msgid="2314124409517439288">"10 წუთი"</item>
-    <item msgid="6864027152847611413">"30 წუთი"</item>
-  </string-array>
-  <string-array name="dream_timeout_entries">
-    <item msgid="3149294732238283185">"არასოდეს"</item>
-    <item msgid="2194151041885903260">"15 წამი"</item>
-    <item msgid="5892295237131074341">"30 წამი"</item>
-    <item msgid="3538441365970038213">"1 წუთი"</item>
-    <item msgid="412343871668955639">"2 წუთი"</item>
-    <item msgid="5076853889688991690">"5 წუთი"</item>
-    <item msgid="1903860996174927898">"10 წუთი"</item>
-    <item msgid="6415509612413178727">"30 წუთი"</item>
-  </string-array>
-  <string-array name="lock_after_timeout_entries">
-    <item msgid="8929270399652145290">"დაუყოვნებლივ"</item>
-    <item msgid="6736512735606834431">"5 წამი"</item>
-    <item msgid="8044619388267891375">"15 წამი"</item>
-    <item msgid="1822002388249545488">"30 წამი"</item>
-    <item msgid="8538071621211916519">"1 წუთი"</item>
-    <item msgid="5663439580228932882">"2 წუთი"</item>
-    <item msgid="49888496216106852">"5 წუთი"</item>
-    <item msgid="9002737361305019353">"10 წუთი"</item>
-    <item msgid="4322676235684793329">"30 წუთი"</item>
-  </string-array>
-  <string-array name="entries_font_size">
-    <item msgid="8166647333858618801">"პატარა"</item>
-    <item msgid="1932071435506638315">"ჩვეულებრივი"</item>
-    <item msgid="38373998008112077">"დიდი"</item>
-    <item msgid="7786168277516233536">"უზარმაზარი"</item>
-  </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"ძალიან ნელი"</item>
-    <item msgid="2361722960903353554">"ნელი"</item>
-    <item msgid="1145554631248513562">"ჩვეულებრივი"</item>
-    <item msgid="7553665153391107454">"სწრაფი"</item>
-    <item msgid="1370673569131070146">"უფრო სწრაფი"</item>
-    <item msgid="4648206845228970803">"ძალიან სწრაფი"</item>
-    <item msgid="4977949754169483251">"ჩქარი"</item>
-    <item msgid="6106302964845503577">"ძალიან ჩქარი"</item>
-    <item msgid="6800277205640837264">"უსწრაფესი"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"ძალიან დაბალი"</item>
-    <item msgid="2692137425242433765">"დაბალი"</item>
-    <item msgid="3332408460740717754">"ჩვეულებრივი"</item>
-    <item msgid="4907380534957572531">"მაღალი"</item>
-    <item msgid="4699640516390840297">"ძალიან მაღალი"</item>
-  </string-array>
-  <string-array name="wifi_status">
-    <item msgid="1922181315419294640"></item>
-    <item msgid="8934131797783724664">"სკანირება…"</item>
-    <item msgid="8513729475867537913">"დაკავშირება…"</item>
-    <item msgid="515055375277271756">"ავტორიზაცია…"</item>
-    <item msgid="1943354004029184381">"IP მისამართის მიღება…"</item>
-    <item msgid="4221763391123233270">"დაკავშირებულია"</item>
-    <item msgid="624838831631122137">"შეწყვეტილია"</item>
-    <item msgid="7979680559596111948">"კავშირის გაწყვეტა…"</item>
-    <item msgid="1634960474403853625">"არ არის ხაზზე"</item>
-    <item msgid="746097431216080650">"ვერ მოხერხდა"</item>
-    <item msgid="6367044185730295334">"დაბლოკილი"</item>
-    <item msgid="503942654197908005">"ცუდი კავშირის დროებით თავიდან აცილება"</item>
-  </string-array>
-  <string-array name="wifi_status_with_ssid">
-    <item msgid="7714855332363650812"></item>
-    <item msgid="8878186979715711006">"სკანირება…"</item>
-    <item msgid="355508996603873860">"მიმდინარეობს დაკავშირება <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-თან…"</item>
-    <item msgid="554971459996405634">"ავთენტიფიკაცია <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ში…"</item>
-    <item msgid="7928343808033020343">"IP მისამართის მოპოვება <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-დან…"</item>
-    <item msgid="8937994881315223448">"დაკავშირებულია <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-თან"</item>
-    <item msgid="1330262655415760617">"შეჩერებული"</item>
-    <item msgid="7698638434317271902">"კავშირის გაწყვეტა <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-თან…"</item>
-    <item msgid="197508606402264311">"კავშირი გაწყვეტილია"</item>
-    <item msgid="8578370891960825148">"ვერ მოხერხდა"</item>
-    <item msgid="5660739516542454527">"დაბლოკილი"</item>
-    <item msgid="1805837518286731242">"ცუდი კავშირის დროებით თავიდან აცილება"</item>
-  </string-array>
-    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
-    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
-    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
-    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
-    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
-    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
-    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
-  <string-array name="wifi_eap_method">
-    <item msgid="1160193392455075561">"PEAP"</item>
-    <item msgid="7981731051382306293">"TLS"</item>
-    <item msgid="2892994535305020162">"TTLS"</item>
-    <item msgid="435667726254379514">"PWD"</item>
-  </string-array>
-  <string-array name="wifi_p2p_wps_setup">
-    <item msgid="5085064298144493867">"Push ღილაკი"</item>
-    <item msgid="1624323946324499595">"ერთრანგიანი მოწყობილობის პინი"</item>
-    <item msgid="5366790421523328066">"ამ მოწყობილობის PIN-კოდი"</item>
-  </string-array>
-  <string-array name="wifi_p2p_status">
-    <item msgid="1701505390737218306">"დაკავშირებულია"</item>
-    <item msgid="3189211552661432651">"მოწვეულია"</item>
-    <item msgid="3206450250360237549">"წარუმატებელი"</item>
-    <item msgid="7785896708926971207">"ხელმისაწვდომი"</item>
-    <item msgid="2330782789550628803">"დიაპაზონს მიღმა"</item>
-  </string-array>
-  <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="8151962652413645395">"2 წუთი"</item>
-    <item msgid="8675215713017289017">"5 წუთი"</item>
-    <item msgid="477015974247590543">"1 საათი"</item>
-    <item msgid="5198271470953124739">"დროის ლიმიტის გარეშე"</item>
-  </string-array>
-  <string-array name="wifi_signal">
-    <item msgid="2245412278046491293">"სუსტი"</item>
-    <item msgid="5615082285463430971">"ძლიერი"</item>
-    <item msgid="3565079809875324621">"კარგი"</item>
-    <item msgid="5702329417707689835">"შესანიშნავი"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ყოველთვის"</item>
-    <item msgid="844721238536786870">"მხოლოდ ქსელიდან კვების მიღების დროს"</item>
-    <item msgid="2990218920631468642">"ყოველთვის გაითიშოს (ზრდის მობილური ტრაფიკის მოცულობას)"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ყოველთვის"</item>
-    <item msgid="7433294150916905997">"მხოლოდ მაშინ, როცა მიერთებულია"</item>
-    <item msgid="1390404486722375028">"არასოდეს"</item>
-  </string-array>
-  <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"ავტომატურად"</item>
-    <item msgid="6670588712989942178">"მხოლოდ 5 GHz"</item>
-    <item msgid="2715516524973207876">"მხოლოდ 2.4 GHz"</item>
-  </string-array>
-  <string-array name="usage_stats_display_order_types">
-    <item msgid="2100172576767439288">"გამოყენების დრო"</item>
-    <item msgid="3703676222230317933">"მთვლელის ჩართვა"</item>
-    <item msgid="2502754479975776899">"აპის სახელი"</item>
-  </string-array>
-  <string-array name="wifi_eap_entries">
-    <item msgid="8615575908717909498">"PEAP"</item>
-    <item msgid="8667872640594311615">"TLS"</item>
-    <item msgid="7182812872984827322">"TTLS"</item>
-    <item msgid="2318274046749286642">"PWD"</item>
-  </string-array>
-  <string-array name="wifi_peap_phase2_entries">
-    <item msgid="2577747762745812488">"არცერთი"</item>
-    <item msgid="937786527870979616">"MSCHAPV2"</item>
-    <item msgid="5302613883318643629">"GTC"</item>
-  </string-array>
-  <string-array name="wifi_phase2_entries">
-    <item msgid="1818786254010764570">"არც ერთი"</item>
-    <item msgid="6189918678874123056">"PAP"</item>
-    <item msgid="1524112260493662517">"MSCHAP"</item>
-    <item msgid="5923246669412752932">"MSCHAPV2"</item>
-    <item msgid="8651992560135239389">"GTC"</item>
-  </string-array>
-  <string-array name="wifi_ip_settings">
-    <item msgid="3906714200993111074">"DHCP"</item>
-    <item msgid="628395202971532382">"სტატიკური"</item>
-  </string-array>
-  <string-array name="wifi_proxy_settings">
-    <item msgid="4473276491748503377">"არცერთი"</item>
-    <item msgid="8673874894887358090">"მექანიკურად"</item>
-  </string-array>
-  <string-array name="emergency_tone_entries">
-    <item msgid="5165439859689033665">"გამორთული"</item>
-    <item msgid="3165868966179561687">"გაფრთხილება"</item>
-    <item msgid="6038758039030476855">"ვიბრაცია"</item>
-  </string-array>
-  <string-array name="apn_auth_entries">
-    <item msgid="3856896061242872146">"არც ერთი"</item>
-    <item msgid="5756844015743664882">"PAP"</item>
-    <item msgid="535934025797984365">"CHAP"</item>
-    <item msgid="8383098660619805783">"PAP ან CHAP"</item>
-  </string-array>
-  <string-array name="apn_protocol_entries">
-    <item msgid="4852355456199302715">"IPv4"</item>
-    <item msgid="4394161344888484571">"IPv6"</item>
-    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
-  </string-array>
-  <string-array name="bearer_entries">
-    <item msgid="1770285336669531300">"LTE"</item>
-    <item msgid="3044323519470167625">"eHRPD"</item>
-    <item msgid="6848428671997893147">"არ არის მითითებული"</item>
-  </string-array>
-  <string-array name="mvno_type_entries">
-    <item msgid="4367119357633573465">"არც ერთი"</item>
-    <item msgid="6062567900587138000">"SPN"</item>
-    <item msgid="2454085083342423481">"IMSI"</item>
-    <item msgid="2681427309183221543">"GID"</item>
-  </string-array>
-  <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"შიდა მოწყობილობის მეხსიერება"</item>
-    <item msgid="3738430123799803530">"შეცვლადი SD ბარათი"</item>
-    <item msgid="4498124044785815005">"გადაწყვიტოს სისტემამ"</item>
-  </string-array>
-  <string-array name="app_ops_categories">
-    <item msgid="6358963769537892925">"მდებარეობა"</item>
-    <item msgid="255608127647030286">"პირადი"</item>
-    <item msgid="4588829735729884491">"შეტყობინებები"</item>
-    <item msgid="886742181977884584">"მედია"</item>
-    <item msgid="7924928667052300589">"მოწყობილობა"</item>
-  </string-array>
-  <string-array name="app_ops_summaries">
-    <item msgid="4979188868761515915">"მიახლოებითი მდებარეობა"</item>
-    <item msgid="5789673140227507995">"ზუსტი მდებარეობა"</item>
-    <item msgid="1061584358377390581">"GPS"</item>
-    <item msgid="5387405117297558954">"ვიბრაცია"</item>
-    <item msgid="3434165993711230924">"კონტაქტების წაკითხვა"</item>
-    <item msgid="616161687718081936">"კონტაქტების შეცვლა"</item>
-    <item msgid="7638002295329050091">"ზარების სიის ნახვა"</item>
-    <item msgid="6546959730920410907">"ზარების ჟურნალის ჩასწორება"</item>
-    <item msgid="446877710771379667">"კალენდრის წაკითხვა"</item>
-    <item msgid="7674458294386319722">"კალენდრის ჩასწორება"</item>
-    <item msgid="8281201165558093009">"Wi-Fi ქსელის ძებნა"</item>
-    <item msgid="8694611243479480497">"შეტყობინება"</item>
-    <item msgid="7776439107987345446">"ფიჭური ქსელების ძებნა"</item>
-    <item msgid="514615766544675057">"ტელეფონზე დარეკვა"</item>
-    <item msgid="8181415497109310680">"SMS-ის წაკითხვა"</item>
-    <item msgid="6816551144382117307">"SMS-ის შექმნა"</item>
-    <item msgid="4600463921908905030">"SMS-ის მიღება"</item>
-    <item msgid="5958926493289432745">"სასწრაფო SMS-ის მიღება"</item>
-    <item msgid="4945269495221089540">"MMS-ის მიღება"</item>
-    <item msgid="5570472453573929087">"WAP push მიღება"</item>
-    <item msgid="7125408150230860501">"SMS-ის გაგზავნა"</item>
-    <item msgid="7080337936612188061">"ICC SMS-ის წაკითხვა"</item>
-    <item msgid="587124103118495063">"ICC SMS-ის შექმნა"</item>
-    <item msgid="2320577158869025503">"პარამეტრების შეცვლა"</item>
-    <item msgid="1545733463471924009">"სხვა ერთეულებს ზემოდან ჩვენება"</item>
-    <item msgid="3609046903962454582">"შეტყობინებებთან წვდომა"</item>
-    <item msgid="4671646036128214513">"კამერა"</item>
-    <item msgid="1097324338692486211">"აუდიოს ჩაწერა"</item>
-    <item msgid="5031552983987798163">"აუდიოს დაკვრა"</item>
-    <item msgid="8374996688066472414">"გაცვლის ბუფერის წაკითხვა"</item>
-    <item msgid="3045529469061083747">"გაცვლის ბუფერის ცვლილება"</item>
-    <item msgid="5124443975763747838">"მედიის ღილაკები"</item>
-    <item msgid="4547883971364273343">"აუდიოს ფოკუსი"</item>
-    <item msgid="2603878814882344450">"მასტერ-ხმის სიმძლავრე"</item>
-    <item msgid="7136963238377062018">"ხმის სიმძღლავრე"</item>
-    <item msgid="4270236897655923007">"ზარის სიმძლავრე"</item>
-    <item msgid="6325739889222559394">"მედიის ხმა"</item>
-    <item msgid="5762123934816216821">"მაღვიძარას ხმა"</item>
-    <item msgid="785049718065337473">"შეტყობინების ხმა"</item>
-    <item msgid="6700305533746877052">"Bluetooth-ის ხმა"</item>
-    <item msgid="2029227495214047094">"დარჩეს აქტიური"</item>
-    <item msgid="26109888160231211">"მდებარეობის მონიტორინგი"</item>
-    <item msgid="5753382310468855812">"მაღალი ძაბვის მდებარეობის მონიტორინგი"</item>
-  </string-array>
-  <string-array name="app_ops_labels">
-    <item msgid="6602854600289714121">"მდებარეობა"</item>
-    <item msgid="8677040780775113033">"მდებარეობა"</item>
-    <item msgid="1660743989948992916">"მდებარეობა"</item>
-    <item msgid="8791172739860195290">"ვიბრაცია"</item>
-    <item msgid="383413555642128046">"კონტაქტების წაკითხვა"</item>
-    <item msgid="3654594895269697313">"კონტაქტების შეცვლა"</item>
-    <item msgid="7928393476362362538">"ზარების ჟურნალის ნახვა"</item>
-    <item msgid="6248591205254641116">"ზარების ჟურნალის ჩასწორება"</item>
-    <item msgid="6093344633066170692">"კალენდრის წაკითხვა"</item>
-    <item msgid="1334886368750347692">"კალენდრის ჩასწორება"</item>
-    <item msgid="1638204101698708656">"მდებარეობა"</item>
-    <item msgid="2154671955760380322">"შეტყობინების გამოქვეყნება"</item>
-    <item msgid="4282477730595931828">"მდებარეობა"</item>
-    <item msgid="4891423912898525905">"ტელეფონზე დარეკვა"</item>
-    <item msgid="2623604824935968113">"SMS/MMS-ის წაკითხვა"</item>
-    <item msgid="4420177125221176306">"SMS/MMS-ის დაწერა"</item>
-    <item msgid="3986142739951490025">"SMS/MMS-ის მიღება"</item>
-    <item msgid="3984213795861739778">"SMS/MMS მიღება"</item>
-    <item msgid="3656243523752472788">"SMS/MMS მიღება"</item>
-    <item msgid="8105802370238551510">"SMS/MMS-ის მიღება"</item>
-    <item msgid="1407766984645388488">"SMS/MMS გაგზავნა"</item>
-    <item msgid="3527273606643794973">"SMS/MMS-ის წაკითხვა"</item>
-    <item msgid="4370895547001583812">"SMS/MMS-ის დაწერა"</item>
-    <item msgid="4218544235221631789">"პარამეტრების შეცვლა"</item>
-    <item msgid="736541391767350377">"დახაზვა ზემოთ"</item>
-    <item msgid="5530815681721654194">"შეტყობინებებზე წვდომა"</item>
-    <item msgid="781213371706962767">"კამერა"</item>
-    <item msgid="1720492593061838172">"აუდიოს ჩაწერა"</item>
-    <item msgid="3493046322001257041">"აუდიოს დაკვრა"</item>
-    <item msgid="136815868796597058">"გაცვლის ბუფერის წაკითხვა"</item>
-    <item msgid="5238692940326972503">"გაცვლის ბუფერის შეცვლა"</item>
-    <item msgid="5753789168376302997">"მედიის ღილაკები"</item>
-    <item msgid="3265262911688671938">"აუდიოს ფოკუსი"</item>
-    <item msgid="2098976479485046797">"მასტერ-ხმის სიმძლავრე"</item>
-    <item msgid="5660213838861789350">"ხმის სიმძღლავრე"</item>
-    <item msgid="7983336752371254444">"ზარის სიმძლავრე"</item>
-    <item msgid="7878027809189330917">"მედიის ხმა"</item>
-    <item msgid="7260546305036218513">"მაღვიძარას ხმა"</item>
-    <item msgid="9103719301075748925">"შეტყობინების ხმა"</item>
-    <item msgid="7025966722295861512">"Bluetooth-ის ხმა"</item>
-    <item msgid="4665183401128289653">"დარჩეს აქტიური"</item>
-    <item msgid="8584357129746649222">"მდებარეობა"</item>
-    <item msgid="7669257279311110599">"მდებარეობა"</item>
-  </string-array>
-  <string-array name="long_press_timeout_selector_titles">
-    <item msgid="3511504869290423954">"მოკლე"</item>
-    <item msgid="2560532955514699713">"საშუალო"</item>
-    <item msgid="2372711992605524591">"ვრცელი"</item>
-  </string-array>
-  <string-array name="captioning_typeface_selector_titles">
-    <item msgid="1319652728542138112">"ნაგულისხმევი"</item>
-    <item msgid="1016452621833735880">"Sans Serif"</item>
-    <item msgid="2496277987934654454">"Sans-serif შესქელებული"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"თანაბარი შორისი"</item>
-    <item msgid="6857338041963571301">"თავისუფალი"</item>
-    <item msgid="961716102408512888">"კურსივი"</item>
-    <item msgid="784581717183349567">"პატარა მთავრულები"</item>
-  </string-array>
-  <string-array name="captioning_font_size_selector_titles">
-    <item msgid="4800919809575254054">"ძალიან პატარა"</item>
-    <item msgid="6781094565687692782">"პატარა"</item>
-    <item msgid="8222123259497646551">"ჩვეულებრივი"</item>
-    <item msgid="5813217276778560466">"დიდი"</item>
-    <item msgid="9044232017390975191">"ძალიან დიდი"</item>
-  </string-array>
-  <string-array name="captioning_edge_type_selector_titles">
-    <item msgid="6022616153255438487">"არცერთი"</item>
-    <item msgid="1352974708028506778">"კონტური"</item>
-    <item msgid="5850876295428722675">"ჩრდილი"</item>
-    <item msgid="4620283365518546731">"ამაღლებული"</item>
-    <item msgid="6395808180998856466">"დაკლებული"</item>
-  </string-array>
-  <string-array name="captioning_opacity_selector_titles">
-    <item msgid="7622491218136667566">"25%"</item>
-    <item msgid="2367156416247936773">"50%"</item>
-    <item msgid="5395560410107149298">"75%"</item>
-    <item msgid="8342334626783983353">"100 +"</item>
-  </string-array>
-  <string-array name="captioning_preset_selector_titles">
-    <item msgid="1630625150404038035">"თეთრი შავზე"</item>
-    <item msgid="4589278788192525675">"შავი თეთრზე"</item>
-    <item msgid="1309255027325660115">"ყვითელი შავზე"</item>
-    <item msgid="2985943780939258562">"ყვითელი ლურჯზე"</item>
-    <item msgid="7520438652121629055">"მორგებული"</item>
-  </string-array>
-  <string-array name="select_runtime_titles">
-    <item msgid="3574453009229338122">"Dalvik"</item>
-    <item msgid="8978402910750533864">"ART"</item>
-    <item msgid="7839859333977894115">"ART (გამართვა)"</item>
-  </string-array>
-  <string-array name="select_runtime_summaries">
-    <item msgid="6412880178297884701">"Dalvik-ის გამოყენება"</item>
-    <item msgid="5131846588686178907">"ART-ის გამოყენება"</item>
-    <item msgid="4530003713865319928">"ART გამართვის ანაწყობის გამოყენება"</item>
-  </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"არასდროს შეამოწმო"</item>
-    <item msgid="6042769699089883931">"შემოწმდეს მხოლოდ DRM კონტენტი"</item>
-    <item msgid="9174900380056846820">"შემოწმება ყოველთვის"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"არასდროს გამოიყენო HDCP შემოწმება"</item>
-    <item msgid="3878793616631049349">"HDCP შემოწმების გამოყენება მხოლოდ DRM კონტენტის შემთხვევაში"</item>
-    <item msgid="45075631231212732">"ყოველთვის გამოიყენე HDCP შემოწმება"</item>
-  </string-array>
-  <string-array name="window_animation_scale_entries">
-    <item msgid="8134156599370824081">"ანიმაციის გამორთვა"</item>
-    <item msgid="6624864048416710414">"ანიმაციის სიჩქარე .5x"</item>
-    <item msgid="2219332261255416635">"ანიმაციის სიჩქარე 1x"</item>
-    <item msgid="3544428804137048509">"ანიმაციის სიჩქარე 1.5x"</item>
-    <item msgid="3110710404225974514">"ანიმაციის მასშტაბი 2x"</item>
-    <item msgid="4402738611528318731">"ანიმაციის მასშტაბი 5x"</item>
-    <item msgid="6189539267968330656">"ანიმაციის მასშტაბი 10x"</item>
-  </string-array>
-  <string-array name="transition_animation_scale_entries">
-    <item msgid="8464255836173039442">"ანიმაციის გამორთვა"</item>
-    <item msgid="3375781541913316411">"ანიმაცია (მასშტაბი - .5x)"</item>
-    <item msgid="1991041427801869945">"ანიმაცია (მასშტაბი 1x)"</item>
-    <item msgid="4012689927622382874">"ანიმაცია (მასშტაბი 1.5x)"</item>
-    <item msgid="3289156759925947169">"ანიმაციის მასშტაბი: 2x"</item>
-    <item msgid="7705857441213621835">"ანიმაციის მასშტაბი 5x"</item>
-    <item msgid="6660750935954853365">"ანიმაციის მასშტაბი 10x"</item>
-  </string-array>
-  <string-array name="animator_duration_scale_entries">
-    <item msgid="6039901060648228241">"ანიმაციის გარეშე"</item>
-    <item msgid="1138649021950863198">"ანიმაციის სიჩქარე .5x"</item>
-    <item msgid="4394388961370833040">"ანიმაციის მასშტაბი 1x"</item>
-    <item msgid="8125427921655194973">"ანიმაციის სიჩქარე 1.5x"</item>
-    <item msgid="3334024790739189573">"ანიმაციის მასშტაბი: 2x"</item>
-    <item msgid="3170120558236848008">"ანიმაცია (მასშტაბი 5x)"</item>
-    <item msgid="1069584980746680398">"ანიმაციის მასშტაბი: 10x"</item>
-  </string-array>
-  <string-array name="overlay_display_devices_entries">
-    <item msgid="1606809880904982133">"არც ერთი"</item>
-    <item msgid="688482401508173818">"720x480 mdpi"</item>
-    <item msgid="6027541158956821790">"720x480 mdpi (დაცული)"</item>
-    <item msgid="8181151155909301030">"1280x720 tvdpi"</item>
-    <item msgid="2920655562462493148">"1280x720 tvdpi (დაცული)"</item>
-    <item msgid="8910371271391940941">"1920x1080 xhdpi"</item>
-    <item msgid="4171600481380800455">"1920x1080 xhdpi (დაცული)"</item>
-    <item msgid="1937752114395156918">"1280x720 tvdpi და 1920x1080 xhdpi"</item>
-  </string-array>
-  <string-array name="enable_opengl_traces_entries">
-    <item msgid="3191973083884253830">"არც ერთი"</item>
-    <item msgid="9089630089455370183">"Logcat"</item>
-    <item msgid="5397807424362304288">"Systrace (გრაფიკა)"</item>
-    <item msgid="1340692776955662664">"გამოძახებების სია glGetError-ზე"</item>
-  </string-array>
-  <string-array name="show_non_rect_clip_entries">
-    <item msgid="993742912147090253">"გამორთული"</item>
-    <item msgid="675719912558941285">"დახატე არა მართკუთხა მოჭრის რეგიონი ლურჯად"</item>
-    <item msgid="1064373276095698656">"ხატვის ტესტირებული ბრძანების მწვანე ფერით მონიშვნა"</item>
-  </string-array>
-  <string-array name="track_frame_time_entries">
-    <item msgid="2193584639058893150">"გამორთვა"</item>
-    <item msgid="2751513398307949636">"ეკრანზე ზოლების სახით"</item>
-    <item msgid="8272260411216018353">"ეკრანზე ხაზების სახით"</item>
-    <item msgid="120512413928262547">"„adb shell dumpsys gfxinfo“-ში"</item>
-  </string-array>
-  <string-array name="debug_hw_overdraw_entries">
-    <item msgid="8190572633763871652">"გამორთვა"</item>
-    <item msgid="7688197031296835369">"overdraw არეების ჩვენება"</item>
-    <item msgid="2290859360633824369">"დეუტერანომალიის არეების ჩვენება"</item>
-    <item msgid="3448087929560624983">"overdraw მთვლელის ჩვენება"</item>
-  </string-array>
-  <string-array name="app_process_limit_entries">
-    <item msgid="3401625457385943795">"სტანდარტული ლიმიტი"</item>
-    <item msgid="4071574792028999443">"ფონური პროცესები არ არის"</item>
-    <item msgid="4810006996171705398">"არაუმეტეს 1 პროცესისა"</item>
-    <item msgid="8586370216857360863">"არა უმეტეს 2 პროცესისა"</item>
-    <item msgid="836593137872605381">"არა უმეტეს 3 პროცესისა"</item>
-    <item msgid="7899496259191969307">"არაუმეტეს 4 პროცესისა"</item>
-  </string-array>
-  <string-array name="vpn_types_long">
-    <item msgid="2732002039459078847">"PPTP VPN"</item>
-    <item msgid="3799752201662127867">"L2TP/IPSec VPN წინასწარ გაზიარებული ღილაკებით"</item>
-    <item msgid="4725504331295252103">"VPN მიერთება L2TP/IPSec პროტოკოლის მიხედვით სერტიფიკატების გამოყენებით"</item>
-    <item msgid="7526551163264034377">"IPSec VPN წინასწარ გაზიარებული ღილაკებით და Xauth ავტორიზაცია"</item>
-    <item msgid="8064740940687465039">"IPSec VPN სერთიფიკატებითა და Xauth ავთენტიფიკაციით"</item>
-    <item msgid="4946199982372391490">"IPSec VPN მიერთება სერტიფიკატების და კომბინირებული ავთენტიკაციის გამოყენებით"</item>
-  </string-array>
-  <string-array name="vpn_states">
-    <item msgid="8621078286418985762">"კავშირი გაწყვეტილია"</item>
-    <item msgid="6692305604213080515">"მიმდინარეობს ინიციალიზაცია…"</item>
-    <item msgid="8001704909356800092">"მიმდინარეობს დაკავშირება…"</item>
-    <item msgid="4039737283841672166">"დაკავშირებულია"</item>
-    <item msgid="4042143101664725090">"დროის ლიმიტი"</item>
-    <item msgid="7664124146786465092">"წარუმატებელი"</item>
-  </string-array>
-  <string-array name="security_settings_premium_sms_values">
-    <item msgid="7389829271787670252">"შეკითხვა"</item>
-    <item msgid="5077768429488260031">"არასოდეს მიეცეს უფლება"</item>
-    <item msgid="1417929597727989746">"ნებართვის მიცემა - ყოველთვის"</item>
-  </string-array>
-  <string-array name="ram_states">
-    <item msgid="7088762389498381203">"ნორმალური"</item>
-    <item msgid="4517779899383204000">"ზომიერი"</item>
-    <item msgid="406385694840950802">"დაბალი"</item>
-    <item msgid="4212263919458209842">"კრიტიკული"</item>
-  </string-array>
-  <string-array name="inversion_type_entries">
-    <item msgid="9312912686075064">"სტანდარტული"</item>
-    <item msgid="7316546394967864094">"მხოლოდ ფერადოვნება"</item>
-    <item msgid="5385613066929784179">"მხოლოდ მნიშვნელობა"</item>
-  </string-array>
-</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 2780c62..c710edf 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"უცნობი შეცდომა"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"ცივი"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"ხილვადი ყველა ახლომყოფი Bluetooth მოწყობილობისთვის (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"ხილვადი ყველა ახლომყოფი Bluetooth მოწყობილობისთვის"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"უხილავი სხვა Bluetooth მოწყობილობებისთვის"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ხილვადია მხოლოდ დაწყვილებული მოწყობილობებისთვის"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"ხილვადობის დროის ლიმიტი"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ხმოვანი დარეკვის დაბლოკვა"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ჩაკეტილი ეკრანის დროს Bluetooth დარეკვის გამოყენების თავიდან აცილება"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"გავწყვიტო კავშირი?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ეს დაასრულებს თქვენს კავშირს :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"მაუწყებლობა"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"გავაუქმოთ პროფილი?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"პროფილი &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;-გამოირთვება მოწყობილობაზე&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"შეერთებულია"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"აპს სურს, გახადოს თქვენი ტელეფონი ხილვადი სხვა Bluetooth მოწყობილობებისთვის <xliff:g id="TIMEOUT">%1$d</xliff:g> წამით."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"აპს სურს, გახადოს თქვენი ტაბლეტი შესამჩნევი სხვა Bluetooth მოწყობილობებისთვის. ამის შეცვლა შეგიძლიათ მოგვიანებით Bluetooth პარამეტრებში."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"აპს სურს, გახადოს თქვენი ტელეფონი შესამჩნევი სხვა Bluetooth მოწყობილობებისთვის. შეგიძლიათ, ეს მოგვიანებით შეცვალოთ Bluetooth პარამეტრებში."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> სურს ჩართოს Bluetooth მაუწყებლობა, ახლომდებარე მოწყობილობებთან კომინიკაციისათვის. ამის შეცვლა მოგვიანებით Bluetooth პარამეტრებში შეგიძლიათ."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> უნდა ჩართოს Bluetooth და Bluetooth მაუწყებლობა ახლომდებარე მოწყობილობებთან კომინიკაციისათვის. ამის მოგვიანებით შეცვლა Bluetooth-ის პარამეტრებში შეგიძლიათ."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"როდესაც ეს ფუნქცია ჩართულია, თქვენს ტელეფონს შეეძლება ახლომდებარე მოწყობილობებთან კომუნიკაცია.\n\nმაუწყებლობა Bluetooth-ის დაბალი ელკვების სიგნალებს იყენებს."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"აპს სურს, ჩართოს Bluetooth და გახადოს თქვენი ტაბლეტი ხილვადი სხვა მოწყობილობებისთვის <xliff:g id="TIMEOUT">%1$d</xliff:g> წამით."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"აპს სურს, ჩართოს Bluetooth და გახადოს თქვენი ტელეფონი ხილვადი სხვა მოწყობილობებისთვის <xliff:g id="TIMEOUT">%1$d</xliff:g> წამით."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"ერთ-ერთ აპს სჭირდება Bluetooth-ისა და თქვენი ტაბლეტის სხვებისთვის ხილვადობის რეჟიმის ჩართვა. მოგვიანებით თქვენ შეგეძლებათ შეცვალოთ ეს პარამეტრები."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"ერთ-ერთ აპს სჭირდება Bluetooth-ისა და თქვენი ტელეფონის სხვებისთვის ხილვადობის რეჟიმის ჩართვა. მოგვიანებით თქვენ შეგეძლებათ შეცვალოთ ეს პარამეტრები."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> სურს ჩართოს Bluetooth მაუწყებლობა, ახლომდებარე მოწყობილობებთან კომინიკაციისათვის. ამის შეცვლა მოგვიანებით Bluetooth პარამეტრებში შეგიძლიათ."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"როდესაც ეს ფუნქცია ჩართულია, თქვენს ტელეფონს შეეძლება ახლომდებარე მოწყობილობებთან კომუნიკაცია.\n\nმაუწყებლობა Bluetooth-ის დაბალი ელკვების სიგნალებს იყენებს."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth-ის ჩართვა…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth-ის გათიშვა…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"ავტომატური დაკავშირება"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"ხმოვანი ზარები"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"მოცდის რეჟიმი"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"მოცდის რეჟიმი"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"ჩაუთვლელი"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"ზედმეტად ჩათვლილი"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"სულ ცენრალურ პროცესორში"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU აქტიური რეჟიმი"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"დარჩეს აქტიური"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"ვიდეო"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"მუშაობის დრო"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"სიგნალის არქონის ხანგრძლივობა"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"ბატარეის სრული ტევადობა"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"დაანგარიშებული ელკვება"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"ელკვების მინ. რეალური გამოყენება"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"ელკვების მაქს. რეალური გამოყენება"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"ძალით შეჩერება"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"აპის შესახებ"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"აპის პარამეტრები"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ბატარეის დაზოგვის რეჟიმი"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"აპში შესაძლოა იყოს პარამეტრები ბატარეის ხარჯის შესამცირებლად"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"მომხმარებლის მიერ გამოყენებული ბატარეა"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"ჩაუთვლელი ელკვების გამოყენება"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"ზედმეტად ჩათვლილი ელკვების გამოყენება"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> გამორთვის მომენტიდან"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"ელკვებიდან გამოერთების შემდეგ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"სულ გამოყენებული"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index d4eb867..2184f97 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"មិន​ស្គាល់​កំហុស"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"ត្រជាក់"</string>
     <string name="bluetooth" msgid="5549625000628014477">"ប៊្លូធូស"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"ឧបករណ៍​ប៊្លូធូស​នៅ​ក្បែរ​អាច​មើល​ឃើញ​ទាំងអស់ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"ឧបករណ៍​ប៊្លូធូស​នៅ​ក្បែរ​អាច​មើល​ឃើញ​ទាំងអស់"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ឧបករណ៍​ប៊្លូធូស​ផ្សេង​មិន​អាច​មើលឃើញ"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"មើល​ឃើញ​តែ​ឧបករណ៍​បាន​ផ្គូផ្គង"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"អស់​ពេល​មើល​ឃើញ"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ចាក់សោ​ការ​ហៅជា​សំឡេង"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ការ​ពារ​​​ការ​ប្រើ​អ្នក​ហៅ​តាម​ប៊្លូធូស ពេល​ចាក់សោ​អេក្រង់"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ផ្ដាច់?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"វា​នឹង​បញ្ចប់​ការ​តភ្ជាប់​​ជា​មួយ៖&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ការ​ផ្សាយ"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"បិទ​ប្រវត្តិរូប?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"វា​នឹង​បិទ៖&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ពី៖&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"បាន​តភ្ជាប់"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"កម្មវិធី​​ចង់​ឲ្យ​ឧបករណ៍​ប៊្លូធូស​ផ្សេង​ទៀត​អាច​មើល​ឃើញ​​ទូរស័ព្ទ​របស់​អ្នក​រយៈ​ពេល <xliff:g id="TIMEOUT">%1$d</xliff:g> វិនាទី។"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"កម្មវិធី​ចង់​ឲ្យ​ឧបករណ៍​ប៊្លូធូស​ផ្សេង​អាច​មើល​ឃើញ​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក។ អ្នក​អាច​ប្ដូរ​វា​ពេល​ក្រោយ​ក្នុង​ការ​កំណត់​ប៊្លូធូស។"</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"កម្មវិធី​ចង់​ឲ្យ​ឧបករណ៍​ប៊្លូធូស​ផ្សេង​​ទៀត​អាច​មើល​ទូរស័ព្ទ​របស់​អ្នក។ អ្នក​អាច​ប្ដូរ​ការ​ជូន​ដំណឹង​នេះ​ក្នុង​ការ​កំណត់​ប៊្លូធូស។"</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> ចង់​បើក​ប៊្លូធូស និង​ការប្រកាស​​ប៊្លូធូស​ ដើម្បី​ទាក់ទង​ជា​មួយ​ឧបករណ៍​ផ្សេង​ដែល​នៅ​ក្បែរ។ អ្នក​អាច​ប្ដូរ​វា​ពេល​ក្រោយ​ក្នុង​ការ​កំណត់​ប៊្លូធូស។"</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> ចង់​បើក​ប៊្លូធូស និង​ការប្រកាស​​ប៊្លូធូស​ ដើម្បី​ទាក់ទង​ជា​មួយ​ឧបករណ៍​ផ្សេង​ដែល​នៅ​ក្បែរ។ អ្នក​អាច​ប្ដូរ​វា​ពេល​ក្រោយ​ក្នុង​ការ​កំណត់​ប៊្លូធូស។"</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"នៅ​ពេល​លក្ខណៈ​នេះ​ត្រូវ​បាន​បើក ទូរស័ព្ទ​របស់​អ្នក​អាច​ទាក់ទង​ជា​មួយ​ឧបករណ៍​ផ្សេង​ដែល​នៅ​ក្បែរ។\n\nការ​ប្រកាស​ប្រើ​សញ្ញា​ប៊្លូធូស​​ដែល​ប្រើ​ថាមពល​តិច។"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"កម្មវិធី​ចង់​បើក​ប៊្លូធូស និង​ឲ្យ​ឧបករណ៍​ផ្សេង​ទៀត​មើល​ឃើញ​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក​រយៈ​ពេល <xliff:g id="TIMEOUT">%1$d</xliff:g> វិនាទី។"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"កម្មវិធី​ចង់​បើក​ប៊្លូធូស និ​ង​ធ្វើ​ឲ្យ​ឧបករណ៍​ផ្សេង​អាច​មើល​ឃើញ​ទូរស័ព្ទ​របស់​អ្នក​រយៈ​ពេល <xliff:g id="TIMEOUT">%1$d</xliff:g> វិនាទី។"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"កម្មវិធី​ចង់​បើក​ប៊្លូធូស និង​​ឲ្យ​ឧបករណ៍​ផ្សេង​មើល​ឃើញ​ទូរស័ព្ទ​របស់​អ្នក។ អ្នក​អាច​ប្ដូរ​វា​ពេល​ក្រោយ​ក្នុង​ការ​កំណត់​ប៊្លូធូស។"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"កម្មវិធី​ចង់​បើក​ប៊្លូធូស និង​​ឲ្យ​ឧបករណ៍​ផ្សេង​មើល​ឃើញ​ទូរស័ព្ទ​របស់​អ្នក។ អ្នក​អាច​ប្ដូរ​វា​ពេល​ក្រោយ​ក្នុង​ការ​កំណត់​ប៊្លូធូស។"</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> ចង់​បើក​ប៊្លូធូស និង​ការប្រកាស​​ប៊្លូធូស​ ដើម្បី​ទាក់ទង​ជា​មួយ​ឧបករណ៍​ផ្សេង​ដែល​នៅ​ក្បែរ។ អ្នក​អាច​ប្ដូរ​វា​ពេល​ក្រោយ​ក្នុង​ការ​កំណត់​ប៊្លូធូស។"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"នៅ​ពេល​លក្ខណៈ​នេះ​ត្រូវ​បាន​បើក ទូរស័ព្ទ​របស់​អ្នក​អាច​ទាក់ទង​ជា​មួយ​ឧបករណ៍​ផ្សេង​ដែល​នៅ​ក្បែរ។\n\nការ​ប្រកាស​ប្រើ​សញ្ញា​ប៊្លូធូស​​ដែល​ប្រើ​ថាមពល​តិច។"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"កំពុង​បើក​ប៊្លូធូស…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"កំពុង​បិទ​​ប៊្លូធូស…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"តភ្ជាប់​ស្វ័យ​ប្រវត្តិ"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"ការ​ហៅ​ជា​សំឡេង"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"កុំព្យូទ័រ​បន្ទះ​ទំនេរ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ទូរស័ព្ទ​ទំនេរ"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"មិន​រាប់​បញ្ចូល"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"លើស"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU សរុប"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ផ្ទៃ​ខាង​មុខ CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"មិន​ដេក"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"វីដេអូ"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"ពេលវេលា​បើក"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"ពេលវេលា​គ្មាន​សញ្ញា"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"កម្រិត​​ថ្ម​សរុប"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"ថាមពល​បាន​គណនា"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"ថាមពល​ពិតប្រាកដ​អប្បបរមា"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"ថាមពល​ពិតប្រាកដ​អតិបរមា"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"បង្ខំ​ឲ្យ​បញ្ឈប់"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"ព័ត៌មាន​កម្មវិធី"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"ការ​កំណត់​កម្មវិធី"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ជ្រើស​របៀប​សន្សំ​ថ្ម"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"កម្មវិធី​អាច​ផ្ដល់​ការ​កំណត់​ ដើម្បី​កាត់បន្ថយ​ការ​ប្រើ​ថ្ម"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ថ្ម​បាន​ប្រើ​ដោយ​អ្នក​ប្រើ"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"ការ​ប្រើ​ប្រាស់​​ថាមពល​ដែល​មិន​រាប់បញ្ចូល"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"ការ​ប្រើ​ប្រាស់​ថាមពល​លើស"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> តាំង​ពី​បានដក"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"ពេល​បាន​ដក​ឧបករណ៍​បញ្ចូល​ថ្ម​ចុង​ក្រោយ​សម្រាប់ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"ការ​ប្រើ​សរុប"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ebcc51e..734199b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"알 수 없는 오류"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"부족함"</string>
     <string name="bluetooth" msgid="5549625000628014477">"블루투스"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"모든 가까운 블루투스 기기에 표시(<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"모든 가까운 블루투스 기기에 표시"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"다른 블루투스 기기에 표시되지 않음"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"페어링된 기기에만 표시"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"검색 가능 제한시간"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"잠금 시 음성 다이얼링"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"화면 잠금 시 블루투스 다이얼러 사용 방지"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"연결을 해제하시겠습니까?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 연결이 끊어집니다.&lt;br&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"브로드캐스팅"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"프로필을 사용 중지하시겠습니까?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"이렇게 하면 &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;의 &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;이(가) 사용 중지됩니다."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"연결됨"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"앱에서 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에 사용자의 휴대전화가 표시되도록 설정하려고 합니다."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"앱에서 다른 블루투스 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"앱에서 다른 블루투스 기기에 사용자의 휴대전화가 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 블루투스 브로드캐스팅을 사용하여 주변의 기기와 커뮤니케이션하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 블루투스와 블루투스 브로드캐스팅을 사용하여 주변의 기기와 커뮤니케이션하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"이 기능을 사용하면 휴대전화가 주변의 기기와 커뮤니케이션할 수 있습니다.\n\n브로드캐스팅은 저전력 블루투스 신호를 사용합니다."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"앱에서 블루투스를 사용하고 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"앱에서 블루투스를 사용하고 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 기기에 사용자의 휴대전화가 표시되도록 설정하려고 합니다."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"앱에서 블루투스를 사용하고 다른 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"앱에서 블루투스를 사용하고 다른 기기에 사용자의 휴대전화가 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 블루투스 브로드캐스팅을 사용하여 주변의 기기와 커뮤니케이션하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"이 기능을 사용하면 휴대전화가 주변의 기기와 커뮤니케이션할 수 있습니다.\n\n브로드캐스팅은 저전력 블루투스 신호를 사용합니다."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"블루투스를 켜는 중"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"블루투스를 사용 중지하는 중"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"자동 연결"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"음성 통화"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"유휴 상태 태블릿"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"휴대전화 유휴 상태"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"산정되지 않음"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"과다 산정됨"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"총 CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 포그라운드"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"켜진 상태로 유지"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"동영상"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"사용 시간"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"통화 불가능 시간"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"총 배터리 용량"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"계산된 전력 사용량"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"최소 실제 전력 사용량"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"최대 실제 전력 사용량"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"강제 종료"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"앱 정보"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"앱 설정"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"배터리 절약 모드 선택"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"앱에서 배터리 사용을 줄일 수 있는 설정을 제공할 수 있습니다."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"사용자의 배터리 사용"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"전력 사용량 산정되지 않음"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"전력 사용량 과다 산정됨"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"플러그를 뽑은 후 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"마지막으로 플러그를 뽑은 이후 <xliff:g id="UNPLUGGED">%1$s</xliff:g> 동안"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"총 사용량"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index eb337ba..0dbc9d9 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"ຄວາມຜິດພາດທີ່ບໍ່ຮູ້ຈັກ"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"ເຢັນ"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"ສາມາດຊອກເຫັນໄດ້ໂດຍອຸປະກອນ Bluetooth ທີ່ຢູ່ໃກ້ກັນ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"ສາມາດຊອກເຫັນໄດ້ໂດຍອຸປະກອນ Bluetooth ທີ່ຢູ່ໃກ້ກັນ"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ບໍ່ສາມາດຊອກເຫັນໄດ້ໂດຍອຸປະກອນ Bluetooth ອື່ນ"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ເຫັນໄດ້ສະເພາະອຸປະກອນທີ່ຈັບຄູ່ກັນເທົ່ານັ້ນ"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"ໄລຍະໝົດເວລາການຊອກເຫັນ"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ລັອກການໂທດ້ວຍສຽງ"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ປ້ອງກັນການໃຊ້ໂປຣແກຣມໂທອອກດ້ວຍ Bluetooth ໃນເວລາໜ້າຈໍຖືກລັອກໄວ້"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ຕັດການເຊື່ອມຕໍ່ຫຼືບໍ່?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ນີ້ຈະເປັນການຢຸດການເຊື່ອມຕໍ່ຂອງທ່ານກັບ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ການກະ​ຈາຍ​ສັນຍານ"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ປິດການນຳໃຊ້ໂປຣໄຟລ໌?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"ນີ້ຈະເປັນການປິດການນຳໃຊ້:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ຈາກ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"ເຊື່ອມ​ຕໍ່ແລ້ວ"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"ມີແອັບຯຕ້ອງການເຮັດໃຫ້ໂທລະສັບຂອງທ່ານ ສາມາດຊອກເຫັນໄດ້ໂດຍອຸປະກອນ Bluetooth ອື່ນເປັນເວລາ <xliff:g id="TIMEOUT">%1$d</xliff:g> ວິນາທີ."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"ມີແອັບຯຕ້ອງການເຮັດໃຫ້ແທັບເລັດຂອງທ່ານ ສາມາດຖືກຊອກເຫັນໄດ້ໂດຍອຸປະກອນ Bluetooth ອື່ນ. ທ່ານສາມາດປ່ຽນການເຮັດວຽກນີ້ໄດ້ໃນພາຍຫຼັງ ໂດຍໄປທີ່ການຕັ້ງຄ່າ Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"ມີແອັບຯຕ້ອງການເຮັດໃຫ້ໂທລະສັບຂອງທ່ານ ສາມາດເບິ່ງເຫັນໄດ້ໂດຍອຸປະກອນ Bluetooth ອື່ນ. ທ່ານສາມາດປ່ຽນແປງໄດ້ພາຍຫຼັງໃນການຕັ້ງຄ່າ Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>  ຕ້ອງການເປີດການກະຈ່າຍສັນຍານບລູທູດ ເພື່ອຕິດຕໍ່ກັບອຸປະກອນອື່ນໆທີ່ຢູ່ອ້ອມຂ້າງ. ທ່ານສາມາດປ່ຽນແປງການຕັ້ງຄ່ານີ້ໄດ້ພາຍຫຼັງ ຢູ່ໃນການຕັ້ງຄ່າບລູທູດ."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການເປີດບລູທູດ ແລະ ການກະຈ່າຍສັນຍານບລູທູດ ເພື່ອຕິດຕໍ່ກັບອຸປະກອນອື່ນໆທີ່ຢູ່ອ້ອມຂ້າງ. ທ່ານສາມາດປ່ຽນແປງການຕັ້ງຄ່ານີ້ໄດ້ພາຍຫຼັງ ຢູ່ໃນການຕັ້ງຄ່າບລູທູດ."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"ເມື່ອຄຸນສົມບັດນີ້ຖືກເປີດນຳໃຊ້, ໂທລະສັບຂອງທ່ານຈະສາມາດຕິດຕໍ່ກັບອຸປະກອນອື່ນໆທີ່ຢູ່ອ້ອມຂ້າງ.\n\nການກະຈາຍສັນຍານແມ່ນນຳໃຊ້ຄື້ນບລູທູດພະລັງງານຕ່ຳ."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"ມີແອັບຯຕ້ອງການເປີດໃຊ້ Bluetooth ແລະເຮັດໃຫ້ແທັບເລັດຂອງທ່ານ ສາມາດຊອກເຫັນໄດ້ໂດຍອຸປະກອນອື່ນເປັນເວລາ <xliff:g id="TIMEOUT">%1$d</xliff:g> ວິນາທີ."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"ມີແອັບຯຕ້ອງການເປີດໃຊ້ Bluetooth ແລະເຮັດໃຫ້ໂທລະສັບຂອງທ່ານ ສາມາດຊອກເຫັນໄດ້ຈາກອຸປະກອນອື່ນເປັນເວລາ <xliff:g id="TIMEOUT">%1$d</xliff:g> ວິນາທີ."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"ມີແອັບຯຕ້ອງການເປີດໃຊ້ Bluetooth ແລະເຮັດໃຫ້ແທັບເລັດຂອງທ່ານ ສາມາດຖືກຊອກເຫັນໄດ້ໂດຍອຸປະກອນອື່ນ. ທ່ານສາມາດປ່ຽນການເຮັດວຽກນີ້ໄດ້ໃນພາຍຫຼັງ ໂດຍໄປທີ່ການຕັ້ງຄ່າ Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"ມີແອັບຯຕ້ອງການເປີດໃຊ້ Bluetooth ແລະເຮັດໃຫ້ໂທລະສັບຂອງທ່ານ ສາມາດຖືກຊອກເຫັນໄດ້ໂດຍອຸປະກອນອື່ນ. ທ່ານສາມາດປ່ຽນການເຮັດວຽກນີ້ໄດ້ໃນພາຍຫຼັງ ໂດຍໄປທີ່ການຕັ້ງຄ່າ Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>  ຕ້ອງການເປີດການກະຈ່າຍສັນຍານບລູທູດ ເພື່ອຕິດຕໍ່ກັບອຸປະກອນອື່ນໆທີ່ຢູ່ອ້ອມຂ້າງ. ທ່ານສາມາດປ່ຽນແປງການຕັ້ງຄ່ານີ້ໄດ້ພາຍຫຼັງ ຢູ່ໃນການຕັ້ງຄ່າບລູທູດ."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"ເມື່ອຄຸນສົມບັດນີ້ຖືກເປີດນຳໃຊ້, ໂທລະສັບຂອງທ່ານຈະສາມາດຕິດຕໍ່ກັບອຸປະກອນອື່ນໆທີ່ຢູ່ອ້ອມຂ້າງ.\n\nການກະຈາຍສັນຍານແມ່ນນຳໃຊ້ຄື້ນບລູທູດພະລັງງານຕ່ຳ."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"ກຳລັງເປີດ Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"ກຳລັງປິດ Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"ເຊື່ອມຕໍ່ອັດຕະໂນມັດ"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"ການໂທດ້ວຍສຽງ"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ແທັບເລັດບໍ່ເຮັດວຽກ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ໂທລະ​ສັບ​ບໍ່​ເຮັດ​ວຽກ"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"ບໍ່ໄດ້ຄິດໄລ່"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"ຄິດໄລ່ເກີນ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ຮວມ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ພື້ນໜ້າ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ເຮັດວຽກຕະຫຼອດເວລາ"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"ວິດີໂອ"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"ເວລາໃນການໃຊ້ງານ"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"ໄລຍະເວລາທີ່ບໍ່ມີສັນຍານ"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"ຂະໜາດບັນຈຸທັງໝົດຂອງຖ່ານ"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"ພະລັງງານທີ່ໄດ້ຄິດໄລ່"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"ພະລັງງານໂຕຈິງຕໍ່າສຸດ"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"ພະລັງງານໂຕຈິງສູງສຸດ"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"ບັງ​ຄັບ​ປິດ"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"ຂໍ້ມູນແອັບຯ"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"ການຕັ້ງຄ່າແອັບຯ"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ເລືອກໂໝດປະຫຍັດໄຟ"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ແອັບຯອາດນຳສະເໜີການຕັ້ງຄ່າ ເພື່ອຫຼຸດການນຳໃຊ້ແບັດເຕີຣີ"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ແບັດເຕີຣີທີ່ໃຊ້ໂດຍຜູ່ໃຊ້"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"ການໃຊ້ພະລັງງານທີ່ບໍ່ໄດ້ຄິດໄລ່"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"ການໃຊ້ພະລັງງານທີ່ຄິດໄລ່ເກີນ"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ຕັ້ງແຕ່ຖອດສາຍສາກ"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"ການນຳໃຊ້ຕັ້ງແຕ່ຖອດສາຍໄຟອອກ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"ໃຊ້ທັງໝົດ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0c9e1f3..b209d82 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nežinoma klaida"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Neveikiantis"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Matoma visiems netol. esant. „Bluetooth“ įr. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Matoma visiems netoliese esan. „Bluetooth“ įreng."</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nematoma kitiems „Bluetooth“ įrenginiams"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Matoma tik suporuotiems įrenginiams."</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Baigėsi skirtasis matomumo laikas"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Užrakinti numerio rinkimą balsu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Neleisti naudoti „Bluetooth“ numerio rinkiklio, kai ekranas užrakintas"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Atsijungti?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tai nutrauks ryšį su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transliavimas"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Neleisti profilio?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Neleis:&lt;br&gt;&lt;b&gt;„<xliff:g id="PROFILE_NAME">%1$s</xliff:g>“&lt;/b&gt;&lt;br&gt;&lt;br&gt;iš:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Prisijungta"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Programa nori padaryti telefoną <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų „Bluetooth“ įrenginių."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Programa nori padaryti planšetinį kompiuterį matomą kitų „Bluetooth“ įrenginių. Tai galėsite vėliau pakeisti „Bluetooth“ nustatymuose."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Programa nori padaryti telefoną matomą kitų „Bluetooth“ įrenginių. Tai galėsite vėliau pakeisti „Bluetooth“ nustatymuose."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ siekia įjungti „Bluetooth“ transliavimą, kad būtų galima užmegzti ryšį su kitais netoliese esančiais įrenginiais. Vėliau tai galėsite pakeisti „Bluetooth“ nustatymuose."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ siekia įjungti „Bluetooth“ ir „Bluetooth“ transliavimą, kad būtų galima užmegzti ryšį su kitais netoliese esančiais įrenginiais. Vėliau tai galėsite pakeisti „Bluetooth“ nustatymuose."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kai ši funkcija įjungta, telefonas gali užmegzti ryšį su kitais netoliese esančiais įrenginiais.\n\nTransliuoti naudojami mažai energijos naudojantys „Bluetooth“ signalai."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Programa nori įjungti „Bluetooth“ ir padaryti planšetinį kompiuterį <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. matomą kitų įrenginių."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Programa nori įjungti „Bluetooth“ ir padaryti telefoną <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. matomą kitų įrenginių."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Programa nori įjungti „Bluetooth“ ir padaryti planšetinį kompiuterį matomą kitų įrenginių. Tai galėsite vėliau pakeisti „Bluetooth“ nustatymuose."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Programa nori įjungti „Bluetooth“ ir padaryti telefoną matomą kitų įrenginių. Tai galėsite vėliau pakeisti „Bluetooth“ nustatymuose."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ siekia įjungti „Bluetooth“ transliavimą, kad būtų galima užmegzti ryšį su kitais netoliese esančiais įrenginiais. Vėliau tai galėsite pakeisti „Bluetooth“ nustatymuose."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kai ši funkcija įjungta, telefonas gali užmegzti ryšį su kitais netoliese esančiais įrenginiais.\n\nTransliuoti naudojami mažai energijos naudojantys „Bluetooth“ signalai."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Įjungti „Bluetooth“?"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"„Bluetooth“ išjungiamas…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatiškai prisijungti"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Balso skambučiai"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Planšetinis kompiuteris neveikos būsenos"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonas veikia laukimo režime"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Neapskaičiuota"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Per daug apskaičiuota"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Visas CPU laikas"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU aktyvusis langas"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Neužmigdyti"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Vaizdo įrašas"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Laikas, kai buvo įjungta"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Laikas be signalo"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Bendroji akumuliatoriaus talpa"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Apskaičiuota energija"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Minimali reali energija"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Maksimali reali energija"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Sustabdyti"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Programos informacija"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Programos nustatymai"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pasirinkite akumuliatoriaus tausojimo režimą"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Programa gali pasiūlyti nustatymus, kad būtų išeikvojama mažiau akumuliatoriaus energijos"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Naudotojo sunaudota akumuliatoriaus energija"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neapskaičiuotos energijos naudojimas"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Per daug apskaičiuotos energijos naudojimas"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> po to, kai buvo ištrauktas iš lizdo"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Kai paskutinį kartą buvo ištrauktas iš lizdo <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Visas naudojimas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index c85e15e..5247ef7 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nezināma kļūda"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Auksts"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Redzams visām blakus esošām Bluetooth ier. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Redzams visām blakus esošām Bluetooth ierīcēm"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nav redzams citām Bluetooth ierīcēm"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Redzams tikai pārī savienotām ierīcēm"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Redzamības noildze"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloķēt balss iezvani"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Neļaut izmantot Bluetooth iezvanprogrammu, kad ekrāns ir bloķēts"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vai pārtraukt savienojumu?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tiks pārtraukts savienojums ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Apraidīšana"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vai atspējot profilu?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Tiks atspējots:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;No:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Izveidots savienojums"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Tālrunī instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt tālruni redzamu citām Bluetooth ierīcēm."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Planšetdatorā instalētā lietotnē tiek mēģināts padarīt planšetdatoru redzamu citām Bluetooth ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Tālrunī instalētā lietotnē tiek mēģināts padarīt tālruni redzamu citām Bluetooth ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g> ir nepieciešams ieslēgt Bluetooth apraidīšanu, lai sazinātos ar citām tuvumā esošām ierīcēm. Vēlāk šo parametru var mainīt Bluetooth iestatījumos."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"Lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g> ir nepieciešams ieslēgt Bluetooth savienojumu un Bluetooth apraidīšanu, lai sazinātos ar citām tuvumā esošām ierīcēm. Vēlāk šo parametru var mainīt Bluetooth iestatījumos."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kad šī funkcija ir ieslēgta, tālrunis var sazināties ar citām tuvumā esošām ierīcēm.\n\nApraidīšanai tiek izmantoti Bluetooth signāli ar mazu enerģijas patēriņu."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Planšetdatorā instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm ieslēgt Bluetooth savienojumu un padarīt planšetdatoru redzamu citām ierīcēm. Vai atļaut?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Tālrunī instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm ieslēgt Bluetooth savienojumu un padarīt tālruni redzamu citām ierīcēm. Vai atļaut?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Planšetdatorā instalētā lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu un padarīt planšetdatoru redzamu citām ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Tālrunī instalētā lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu un padarīt tālruni redzamu citām ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g> ir nepieciešams ieslēgt Bluetooth apraidīšanu, lai sazinātos ar citām tuvumā esošām ierīcēm. Vēlāk šo parametru var mainīt Bluetooth iestatījumos."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kad šī funkcija ir ieslēgta, tālrunis var sazināties ar citām tuvumā esošām ierīcēm.\n\nApraidīšanai tiek izmantoti Bluetooth signāli ar mazu enerģijas patēriņu."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Tiek ieslēgta tehnoloģija Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Notiek Bluetooth savienojuma izslēgšana…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automātiski izveidot savienojumu"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Balss zvani"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Planšetdators ir gaidstāvē"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Tālrunis dīkstāvē"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Neuzskaitītais"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Par daudz uzskaitītais"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kopā"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU akt. režīms"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Neļaut pāriet miega rež."</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Videoklips"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Laiks ieslēgtā stāvoklī"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Laiks bez signāla"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Akumulatora kopējā kapacitāte"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Aprēķinātais enerģijas patēriņš"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Minimālais faktiskais enerģijas patēriņš"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Maksimālais faktiskais enerģijas patēriņš"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forsēt apturēšanu"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informācija par lietotni"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Lietotnes iestatījumi"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Atlasiet akumulatora jaudas taupīšanas režīmu"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Lietotnē var būt pieejami iestatījumi akumulatora enerģijas patēriņa samazināšanai"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Lietotāja patērētā akumulatora jauda"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neuzskaitītais enerģijas patēriņš"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Par daudz uzskaitītais enerģijas patēriņš"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> kopš atslēgšanas"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Pēdējās atslēgšanas laikā <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Kopējais patēriņš"</string>
diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn-rMN/arrays.xml
deleted file mode 100644
index ff688f6..0000000
--- a/res/values-mn-rMN/arrays.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-**
-** Copyright 2007 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.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="timezone_filters">
-    <item msgid="5296756001147094692">"Америк"</item>
-    <item msgid="3005562397632768392">"Европ"</item>
-    <item msgid="5696915123093701218">"Африк"</item>
-    <item msgid="4439789052790868249">"Ази"</item>
-    <item msgid="956915953069815961">"Австрали"</item>
-    <item msgid="5345178126174698955">"Номхон далай"</item>
-    <item msgid="8392017019801393511">"Бүгд"</item>
-  </string-array>
-  <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 секунд"</item>
-    <item msgid="8881760709354815449">"30 секунд"</item>
-    <item msgid="7589406073232279088">"1 минут"</item>
-    <item msgid="7001195990902244174">"2 минут"</item>
-    <item msgid="7489864775127957179">"5 минут"</item>
-    <item msgid="2314124409517439288">"10 минут"</item>
-    <item msgid="6864027152847611413">"30 минут"</item>
-  </string-array>
-  <string-array name="dream_timeout_entries">
-    <item msgid="3149294732238283185">"Хэзээ ч үгүй"</item>
-    <item msgid="2194151041885903260">"15 секунд"</item>
-    <item msgid="5892295237131074341">"30 секунд"</item>
-    <item msgid="3538441365970038213">"1 минут"</item>
-    <item msgid="412343871668955639">"2 минут"</item>
-    <item msgid="5076853889688991690">"5 минут"</item>
-    <item msgid="1903860996174927898">"10 минут"</item>
-    <item msgid="6415509612413178727">"30 минут"</item>
-  </string-array>
-  <string-array name="lock_after_timeout_entries">
-    <item msgid="8929270399652145290">"Шууд"</item>
-    <item msgid="6736512735606834431">"5 секунд"</item>
-    <item msgid="8044619388267891375">"15 секунд"</item>
-    <item msgid="1822002388249545488">"30 секунд"</item>
-    <item msgid="8538071621211916519">"1 минут"</item>
-    <item msgid="5663439580228932882">"2 минут"</item>
-    <item msgid="49888496216106852">"5 минут"</item>
-    <item msgid="9002737361305019353">"10 минут"</item>
-    <item msgid="4322676235684793329">"30 минут"</item>
-  </string-array>
-  <string-array name="entries_font_size">
-    <item msgid="8166647333858618801">"Жижиг"</item>
-    <item msgid="1932071435506638315">"Энгийн"</item>
-    <item msgid="38373998008112077">"Том"</item>
-    <item msgid="7786168277516233536">"Том"</item>
-  </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Маш удаан"</item>
-    <item msgid="2361722960903353554">"Удаан"</item>
-    <item msgid="1145554631248513562">"Энгийн"</item>
-    <item msgid="7553665153391107454">"Хурдан"</item>
-    <item msgid="1370673569131070146">"Илүү хурдан"</item>
-    <item msgid="4648206845228970803">"Маш хурдан"</item>
-    <item msgid="4977949754169483251">"Түргэн"</item>
-    <item msgid="6106302964845503577">"Маш түргэн"</item>
-    <item msgid="6800277205640837264">"Хамгийн хурдан"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Маш нам"</item>
-    <item msgid="2692137425242433765">"Бага"</item>
-    <item msgid="3332408460740717754">"Энгийн"</item>
-    <item msgid="4907380534957572531">"Их"</item>
-    <item msgid="4699640516390840297">"Маш өндөр"</item>
-  </string-array>
-  <string-array name="wifi_status">
-    <item msgid="1922181315419294640"></item>
-    <item msgid="8934131797783724664">"Скан хийж байна…"</item>
-    <item msgid="8513729475867537913">"Холбогдож байна..."</item>
-    <item msgid="515055375277271756">"Гэрчлэж байна"</item>
-    <item msgid="1943354004029184381">"IP хаягийг авч байна…"</item>
-    <item msgid="4221763391123233270">"Холбогдсон"</item>
-    <item msgid="624838831631122137">"Түр хаасан"</item>
-    <item msgid="7979680559596111948">"Салгаж байна…"</item>
-    <item msgid="1634960474403853625">"Салгагдсан"</item>
-    <item msgid="746097431216080650">"Амжилтгүй"</item>
-    <item msgid="6367044185730295334">"Хориглогдсон"</item>
-    <item msgid="503942654197908005">"Муу холболтоос түр зайлсхийж байна"</item>
-  </string-array>
-  <string-array name="wifi_status_with_ssid">
-    <item msgid="7714855332363650812"></item>
-    <item msgid="8878186979715711006">"Скан хийж байна…"</item>
-    <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> руу холбогдож байна…"</item>
-    <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-тай гэрчилж байна…"</item>
-    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-с IP хаягийг авч байна…"</item>
-    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> руу холбогдсон"</item>
-    <item msgid="1330262655415760617">"Түр хаасан"</item>
-    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-с салгагдаж байна…"</item>
-    <item msgid="197508606402264311">"Салгагдсан"</item>
-    <item msgid="8578370891960825148">"Амжилтгүй"</item>
-    <item msgid="5660739516542454527">"Хориглогдсон"</item>
-    <item msgid="1805837518286731242">"Муу холболтоос түр зайлсхийж байна"</item>
-  </string-array>
-    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
-    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
-    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
-    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
-    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
-    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
-    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
-    <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
-    <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
-  <string-array name="wifi_eap_method">
-    <item msgid="1160193392455075561">"PEAP"</item>
-    <item msgid="7981731051382306293">"TLS"</item>
-    <item msgid="2892994535305020162">"TTLS"</item>
-    <item msgid="435667726254379514">"PWD"</item>
-  </string-array>
-  <string-array name="wifi_p2p_wps_setup">
-    <item msgid="5085064298144493867">"Товчлуур"</item>
-    <item msgid="1624323946324499595">"Түнш төхөөрөмжийн PIN"</item>
-    <item msgid="5366790421523328066">"Энэ төхөөрөмжөөс PIN"</item>
-  </string-array>
-  <string-array name="wifi_p2p_status">
-    <item msgid="1701505390737218306">"Холбогдсон"</item>
-    <item msgid="3189211552661432651">"Уригдсан"</item>
-    <item msgid="3206450250360237549">"Амжилтгүй"</item>
-    <item msgid="7785896708926971207">"Холбогдсон"</item>
-    <item msgid="2330782789550628803">"Хүрээнээс гарсан"</item>
-  </string-array>
-  <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="8151962652413645395">"2 минут"</item>
-    <item msgid="8675215713017289017">"5 минут"</item>
-    <item msgid="477015974247590543">"1 цаг"</item>
-    <item msgid="5198271470953124739">"Хэзээ ч завсарлахгүй"</item>
-  </string-array>
-  <string-array name="wifi_signal">
-    <item msgid="2245412278046491293">"Муу"</item>
-    <item msgid="5615082285463430971">"Боломжийн"</item>
-    <item msgid="3565079809875324621">"Сайн"</item>
-    <item msgid="5702329417707689835">"Маш сайн"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Байнга"</item>
-    <item msgid="844721238536786870">"Зөвхөн залгасан үед"</item>
-    <item msgid="2990218920631468642">"Хэзээ ч үгүй (дата ашиглалтыг нэмэгдүүлдэг)"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Байнга"</item>
-    <item msgid="7433294150916905997">"Зөвхөн залгасан үед"</item>
-    <item msgid="1390404486722375028">"Хэзээ ч үгүй"</item>
-  </string-array>
-  <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Автомат"</item>
-    <item msgid="6670588712989942178">"Зөвхөн 5 GHz"</item>
-    <item msgid="2715516524973207876">"Зөвхөн 2.4 GHz"</item>
-  </string-array>
-  <string-array name="usage_stats_display_order_types">
-    <item msgid="2100172576767439288">"Ашиглалтын цаг"</item>
-    <item msgid="3703676222230317933">"Тооллогыг эхлүүлэх"</item>
-    <item msgid="2502754479975776899">"Апп нэр"</item>
-  </string-array>
-  <string-array name="wifi_eap_entries">
-    <item msgid="8615575908717909498">"PEAP"</item>
-    <item msgid="8667872640594311615">"TLS"</item>
-    <item msgid="7182812872984827322">"TTLS"</item>
-    <item msgid="2318274046749286642">"PWD"</item>
-  </string-array>
-  <string-array name="wifi_peap_phase2_entries">
-    <item msgid="2577747762745812488">"Байхгүй"</item>
-    <item msgid="937786527870979616">"MSCHAPV2"</item>
-    <item msgid="5302613883318643629">"GTC"</item>
-  </string-array>
-  <string-array name="wifi_phase2_entries">
-    <item msgid="1818786254010764570">"Байхгүй"</item>
-    <item msgid="6189918678874123056">"PAP"</item>
-    <item msgid="1524112260493662517">"MSCHAP"</item>
-    <item msgid="5923246669412752932">"MSCHAPV2"</item>
-    <item msgid="8651992560135239389">"GTC"</item>
-  </string-array>
-  <string-array name="wifi_ip_settings">
-    <item msgid="3906714200993111074">"DHCP"</item>
-    <item msgid="628395202971532382">"Статик"</item>
-  </string-array>
-  <string-array name="wifi_proxy_settings">
-    <item msgid="4473276491748503377">"Байхгүй"</item>
-    <item msgid="8673874894887358090">"Гараар"</item>
-  </string-array>
-  <string-array name="emergency_tone_entries">
-    <item msgid="5165439859689033665">"Хаах"</item>
-    <item msgid="3165868966179561687">"Сэрэмжлүүлэг"</item>
-    <item msgid="6038758039030476855">"Чичиргээ"</item>
-  </string-array>
-  <string-array name="apn_auth_entries">
-    <item msgid="3856896061242872146">"Байхгүй"</item>
-    <item msgid="5756844015743664882">"PAP"</item>
-    <item msgid="535934025797984365">"CHAP"</item>
-    <item msgid="8383098660619805783">"PAP буюу CHAP"</item>
-  </string-array>
-  <string-array name="apn_protocol_entries">
-    <item msgid="4852355456199302715">"IPv4"</item>
-    <item msgid="4394161344888484571">"IPv6"</item>
-    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
-  </string-array>
-  <string-array name="bearer_entries">
-    <item msgid="1770285336669531300">"LTE"</item>
-    <item msgid="3044323519470167625">"eHRPD"</item>
-    <item msgid="6848428671997893147">"Тодорхойлоогүй"</item>
-  </string-array>
-  <string-array name="mvno_type_entries">
-    <item msgid="4367119357633573465">"None"</item>
-    <item msgid="6062567900587138000">"SPN"</item>
-    <item msgid="2454085083342423481">"IMSI"</item>
-    <item msgid="2681427309183221543">"GID"</item>
-  </string-array>
-  <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"Дотоод төхөөрөмжийн сан"</item>
-    <item msgid="3738430123799803530">"Авагддаг SD карт"</item>
-    <item msgid="4498124044785815005">"Системээр шийдүүлэх"</item>
-  </string-array>
-  <string-array name="app_ops_categories">
-    <item msgid="6358963769537892925">"Байршил"</item>
-    <item msgid="255608127647030286">"Хувийн"</item>
-    <item msgid="4588829735729884491">"Зурвас"</item>
-    <item msgid="886742181977884584">"Медиа"</item>
-    <item msgid="7924928667052300589">"Төхөөрөмж"</item>
-  </string-array>
-  <string-array name="app_ops_summaries">
-    <item msgid="4979188868761515915">"бүдүүн байршил"</item>
-    <item msgid="5789673140227507995">"сайн байршил"</item>
-    <item msgid="1061584358377390581">"GPS"</item>
-    <item msgid="5387405117297558954">"чичиргээ"</item>
-    <item msgid="3434165993711230924">"харилцагчдыг унших"</item>
-    <item msgid="616161687718081936">"харилцагчдыг өөрчлөх"</item>
-    <item msgid="7638002295329050091">"дуудлагын жагсаалтыг унших"</item>
-    <item msgid="6546959730920410907">"дуудлагын жагсаалтыг өөрчлөх"</item>
-    <item msgid="446877710771379667">"календарь унших"</item>
-    <item msgid="7674458294386319722">"календарийг өөрчлөх"</item>
-    <item msgid="8281201165558093009">"wi-fi скан"</item>
-    <item msgid="8694611243479480497">"мэдэгдэл"</item>
-    <item msgid="7776439107987345446">"үүрэн скан"</item>
-    <item msgid="514615766544675057">"утас руу залгах"</item>
-    <item msgid="8181415497109310680">"SMS унших"</item>
-    <item msgid="6816551144382117307">"SMS бичих"</item>
-    <item msgid="4600463921908905030">"SMS хүлээн авах"</item>
-    <item msgid="5958926493289432745">"яаралтай SMS хүлээж авах"</item>
-    <item msgid="4945269495221089540">"MMS хүлээн авах"</item>
-    <item msgid="5570472453573929087">"WAP хүлээн авах"</item>
-    <item msgid="7125408150230860501">"SMS илгээх"</item>
-    <item msgid="7080337936612188061">"ICC SMS унших"</item>
-    <item msgid="587124103118495063">"ICC SMS бичих"</item>
-    <item msgid="2320577158869025503">"тохиргоог өөрчлөх"</item>
-    <item msgid="1545733463471924009">"дээр нь нээх"</item>
-    <item msgid="3609046903962454582">"мэдэгдэлд хандах"</item>
-    <item msgid="4671646036128214513">"камера"</item>
-    <item msgid="1097324338692486211">"аудио бичих"</item>
-    <item msgid="5031552983987798163">"аудио тоглуулах"</item>
-    <item msgid="8374996688066472414">"түр санах ойг унших"</item>
-    <item msgid="3045529469061083747">"түр санах ойг өөрчлөх"</item>
-    <item msgid="5124443975763747838">"медиа товч"</item>
-    <item msgid="4547883971364273343">"аудио фокус"</item>
-    <item msgid="2603878814882344450">"үндсэн дууны хэмжээ"</item>
-    <item msgid="7136963238377062018">"хоолойн дууны хэмжээ"</item>
-    <item msgid="4270236897655923007">"хонхны дууны хэмжээ"</item>
-    <item msgid="6325739889222559394">"медиа дууны хэмжээ"</item>
-    <item msgid="5762123934816216821">"сэрүүлгийн дууны хэмжээ"</item>
-    <item msgid="785049718065337473">"мэдэгдлийн дууны хэмжээ"</item>
-    <item msgid="6700305533746877052">"блютүүтийн хэмжээ"</item>
-    <item msgid="2029227495214047094">"сэрүүн байлгах"</item>
-    <item msgid="26109888160231211">"байршлыг хянах"</item>
-    <item msgid="5753382310468855812">"өндөр чадалтай байршлуудыг хянах"</item>
-  </string-array>
-  <string-array name="app_ops_labels">
-    <item msgid="6602854600289714121">"Байршил"</item>
-    <item msgid="8677040780775113033">"Байршил"</item>
-    <item msgid="1660743989948992916">"Байршил"</item>
-    <item msgid="8791172739860195290">"Чичиргээ"</item>
-    <item msgid="383413555642128046">"Харилцагчдыг унших"</item>
-    <item msgid="3654594895269697313">"Харилцагчдыг өөрчлөх"</item>
-    <item msgid="7928393476362362538">"Дуудлагын жагсаалтыг унших"</item>
-    <item msgid="6248591205254641116">"Дуудлагын жагсаалтыг өөрчлөх"</item>
-    <item msgid="6093344633066170692">"Календарь унших"</item>
-    <item msgid="1334886368750347692">"Календарийг өөрчлөх"</item>
-    <item msgid="1638204101698708656">"Байршил"</item>
-    <item msgid="2154671955760380322">"Пост мэдэгдэл"</item>
-    <item msgid="4282477730595931828">"Байршил"</item>
-    <item msgid="4891423912898525905">"Утас руу залгах"</item>
-    <item msgid="2623604824935968113">"SMS/MMS унших"</item>
-    <item msgid="4420177125221176306">"SMS/MMS бичих"</item>
-    <item msgid="3986142739951490025">"SMS/MMS хүлээн авах"</item>
-    <item msgid="3984213795861739778">"SMS/MMS хүлээн авах"</item>
-    <item msgid="3656243523752472788">"SMS/MMS хүлээн авах"</item>
-    <item msgid="8105802370238551510">"SMS/MMS хүлээн авах"</item>
-    <item msgid="1407766984645388488">"SMS/MMS илгээх"</item>
-    <item msgid="3527273606643794973">"SMS/MMS унших"</item>
-    <item msgid="4370895547001583812">"SMS/MMS бичих"</item>
-    <item msgid="4218544235221631789">"Тохиргоог өөрчлөх"</item>
-    <item msgid="736541391767350377">"Дээр нь нээх"</item>
-    <item msgid="5530815681721654194">"Хандалтын мэдэгдэл"</item>
-    <item msgid="781213371706962767">"Камер"</item>
-    <item msgid="1720492593061838172">"Аудио бичих"</item>
-    <item msgid="3493046322001257041">"Аудио тоглуулах"</item>
-    <item msgid="136815868796597058">"Түр санах ойг унших"</item>
-    <item msgid="5238692940326972503">"Түр санах ойг өөрчлөх"</item>
-    <item msgid="5753789168376302997">"Медиа товч"</item>
-    <item msgid="3265262911688671938">"Аудио фокус"</item>
-    <item msgid="2098976479485046797">"Үндсэн дууны хэмжээ"</item>
-    <item msgid="5660213838861789350">"Хоолойн дууны хэмжээ"</item>
-    <item msgid="7983336752371254444">"Хонхны дууны хэмжээ"</item>
-    <item msgid="7878027809189330917">"Медиа дууны хэмжээ"</item>
-    <item msgid="7260546305036218513">"Сэрүүлгийн дууны хэмжээ"</item>
-    <item msgid="9103719301075748925">"Мэдэгдлийн дууны хэмжээ"</item>
-    <item msgid="7025966722295861512">"Блютүүтийн хэмжээ"</item>
-    <item msgid="4665183401128289653">"Сэрүүн байлгах"</item>
-    <item msgid="8584357129746649222">"Байршил"</item>
-    <item msgid="7669257279311110599">"Байршил"</item>
-  </string-array>
-  <string-array name="long_press_timeout_selector_titles">
-    <item msgid="3511504869290423954">"Богино"</item>
-    <item msgid="2560532955514699713">"Дундаж"</item>
-    <item msgid="2372711992605524591">"Урт"</item>
-  </string-array>
-  <string-array name="captioning_typeface_selector_titles">
-    <item msgid="1319652728542138112">"Үндсэн"</item>
-    <item msgid="1016452621833735880">"Sans Serif"</item>
-    <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Энгийн"</item>
-    <item msgid="961716102408512888">"Үргэлжилсэн"</item>
-    <item msgid="784581717183349567">"Жижиг дармал"</item>
-  </string-array>
-  <string-array name="captioning_font_size_selector_titles">
-    <item msgid="4800919809575254054">"Маш жижиг"</item>
-    <item msgid="6781094565687692782">"Жижиг"</item>
-    <item msgid="8222123259497646551">"Энгийн"</item>
-    <item msgid="5813217276778560466">"Том"</item>
-    <item msgid="9044232017390975191">"Маш том"</item>
-  </string-array>
-  <string-array name="captioning_edge_type_selector_titles">
-    <item msgid="6022616153255438487">"Хоосон"</item>
-    <item msgid="1352974708028506778">"Гадна хүрээ"</item>
-    <item msgid="5850876295428722675">"Сүүдэр тусгах"</item>
-    <item msgid="4620283365518546731">"Товгор"</item>
-    <item msgid="6395808180998856466">"Ухмал"</item>
-  </string-array>
-  <string-array name="captioning_opacity_selector_titles">
-    <item msgid="7622491218136667566">"25%"</item>
-    <item msgid="2367156416247936773">"50%"</item>
-    <item msgid="5395560410107149298">"75%"</item>
-    <item msgid="8342334626783983353">"100%"</item>
-  </string-array>
-  <string-array name="captioning_preset_selector_titles">
-    <item msgid="1630625150404038035">"Хар дээр цагаан"</item>
-    <item msgid="4589278788192525675">"Цагаан дээр хар"</item>
-    <item msgid="1309255027325660115">"Хар дээр шар"</item>
-    <item msgid="2985943780939258562">"Цэнхэр дээр шар"</item>
-    <item msgid="7520438652121629055">"Тааруулсан"</item>
-  </string-array>
-  <string-array name="select_runtime_titles">
-    <item msgid="3574453009229338122">"Dalvik"</item>
-    <item msgid="8978402910750533864">"ART"</item>
-    <item msgid="7839859333977894115">"ART (дебаг)"</item>
-  </string-array>
-  <string-array name="select_runtime_summaries">
-    <item msgid="6412880178297884701">"Dalvik ашиглах"</item>
-    <item msgid="5131846588686178907">"ART ашиглах"</item>
-    <item msgid="4530003713865319928">"ART дебаг ашиглах"</item>
-  </string-array>
-  <string-array name="hdcp_checking_titles">
-    <item msgid="441827799230089869">"Хэзээ ч шалгахгүй"</item>
-    <item msgid="6042769699089883931">"Зөвхөн DRM контентыг шалгах"</item>
-    <item msgid="9174900380056846820">"Байнга шалгах"</item>
-  </string-array>
-  <string-array name="hdcp_checking_summaries">
-    <item msgid="505558545611516707">"HDCP шалгахыг хэзээ ч ашиглахгүй"</item>
-    <item msgid="3878793616631049349">"HDCP шалгахыг зөвхөн DRM контентэд ашиглах"</item>
-    <item msgid="45075631231212732">"Байнга HDCP шалгахыг ашиглах"</item>
-  </string-array>
-  <string-array name="window_animation_scale_entries">
-    <item msgid="8134156599370824081">"Дүрс амилуулалт идэвхгүй"</item>
-    <item msgid="6624864048416710414">"Дүрс амилуулах далайц .5x"</item>
-    <item msgid="2219332261255416635">"Дүрс амилуулах далайц 1x"</item>
-    <item msgid="3544428804137048509">"Дүрс амилуулах далайц 1.5x"</item>
-    <item msgid="3110710404225974514">"Дүрс амилуулалтын далайц 2x"</item>
-    <item msgid="4402738611528318731">"Дүрс амилуулалтын далайц 5x"</item>
-    <item msgid="6189539267968330656">"Дүрс амилуулалтын далайц 10x"</item>
-  </string-array>
-  <string-array name="transition_animation_scale_entries">
-    <item msgid="8464255836173039442">"Дүрс амилуулалт идэвхгүй"</item>
-    <item msgid="3375781541913316411">"Дүрс амилуулах далайц .5x"</item>
-    <item msgid="1991041427801869945">"Дүрс амилуулах далайц 1x"</item>
-    <item msgid="4012689927622382874">"Дүрс амилуулах далайц 1.5x"</item>
-    <item msgid="3289156759925947169">"Дүрс амилуулалтын далайц 2x"</item>
-    <item msgid="7705857441213621835">"Дүрс амилуулалтын далайц 5x"</item>
-    <item msgid="6660750935954853365">"Дүрс амилуулалтын далайц 10x"</item>
-  </string-array>
-  <string-array name="animator_duration_scale_entries">
-    <item msgid="6039901060648228241">"Дүрс амилуулалт идэвхгүй"</item>
-    <item msgid="1138649021950863198">"Дүрс амилуулах далайц .5x"</item>
-    <item msgid="4394388961370833040">"Дүрс амилуулах далайц 1x"</item>
-    <item msgid="8125427921655194973">"Дүрс амилуулах далайц 1.5x"</item>
-    <item msgid="3334024790739189573">"Дүрс амилуулалтын далайц 2x"</item>
-    <item msgid="3170120558236848008">"Дүрс амилуулалтын далайц 5x"</item>
-    <item msgid="1069584980746680398">"Дүрс амилуулалтын далайц 10x"</item>
-  </string-array>
-  <string-array name="overlay_display_devices_entries">
-    <item msgid="1606809880904982133">"Байхгүй"</item>
-    <item msgid="688482401508173818">"720x480 mdpi"</item>
-    <item msgid="6027541158956821790">"720x480 mdpi (найдвартай)"</item>
-    <item msgid="8181151155909301030">"1280x720 tvdpi"</item>
-    <item msgid="2920655562462493148">"1280x720 tvdpi (найдвартай)"</item>
-    <item msgid="8910371271391940941">"1920x1080 xhdpi"</item>
-    <item msgid="4171600481380800455">"1920x1080 xhdpi (найдвартай)"</item>
-    <item msgid="1937752114395156918">"1280x720 tvdpi болон 1920x1080 xhdpi"</item>
-  </string-array>
-  <string-array name="enable_opengl_traces_entries">
-    <item msgid="3191973083884253830">"Алийг нь ч биш"</item>
-    <item msgid="9089630089455370183">"Logcat"</item>
-    <item msgid="5397807424362304288">"Systrace (График)"</item>
-    <item msgid="1340692776955662664">"Стекийг glGetError дээр дуудах"</item>
-  </string-array>
-  <string-array name="show_non_rect_clip_entries">
-    <item msgid="993742912147090253">"Идэвхгүй"</item>
-    <item msgid="675719912558941285">"Тэгш өнцөгт бус клипийн бүсийг цэнхэрээр зурах"</item>
-    <item msgid="1064373276095698656">"Шалгасан зурах командуудыг ногоон өнгөөр тэмдэглэх"</item>
-  </string-array>
-  <string-array name="track_frame_time_entries">
-    <item msgid="2193584639058893150">"Идэвхгүй"</item>
-    <item msgid="2751513398307949636">"Дэлгэц дээр савхаар"</item>
-    <item msgid="8272260411216018353">"Дэлгэц дээр шулуунаар"</item>
-    <item msgid="120512413928262547">"adb суурь доторх dumpsys gfxinfo"</item>
-  </string-array>
-  <string-array name="debug_hw_overdraw_entries">
-    <item msgid="8190572633763871652">"Идэвхгүй"</item>
-    <item msgid="7688197031296835369">"Давхар дүрслэлтэй хэсгийг харуулах"</item>
-    <item msgid="2290859360633824369">"Өнгө үл ялгагчид зориулсан бүсүүдийг харуулах"</item>
-    <item msgid="3448087929560624983">"Давхар дүрслэлийн тоологчийг харуулах"</item>
-  </string-array>
-  <string-array name="app_process_limit_entries">
-    <item msgid="3401625457385943795">"Стандарт хязгаар"</item>
-    <item msgid="4071574792028999443">"Далд процесс байхгүй"</item>
-    <item msgid="4810006996171705398">"Хамгийн ихдээ 1 процесс"</item>
-    <item msgid="8586370216857360863">"Хамгийн ихдээ 2 процесс"</item>
-    <item msgid="836593137872605381">"Хамгийн ихдээ 3 процесс"</item>
-    <item msgid="7899496259191969307">"Хамгийн ихдээ 4 процесс"</item>
-  </string-array>
-  <string-array name="vpn_types_long">
-    <item msgid="2732002039459078847">"PPTP VPN"</item>
-    <item msgid="3799752201662127867">"Урьдчилан хуваалцсан L2TP/IPSec VPN түлхүүртэй"</item>
-    <item msgid="4725504331295252103">"Сертификаттай L2TP/IPSec VPN"</item>
-    <item msgid="7526551163264034377">"Урьдчилан хуваалцсан түлхүүртэй IPSec VPN болон Xauth гэрчлэлт"</item>
-    <item msgid="8064740940687465039">"Сертификат болон Xauth гэрчлэл бүхий IPSec VPN"</item>
-    <item msgid="4946199982372391490">"Сертификат болон холимог гэрчлэл бүхий IPSec VPN"</item>
-  </string-array>
-  <string-array name="vpn_states">
-    <item msgid="8621078286418985762">"Салгагдсан"</item>
-    <item msgid="6692305604213080515">"Эхлүүлж байна…"</item>
-    <item msgid="8001704909356800092">"Холбогдож байна..."</item>
-    <item msgid="4039737283841672166">"Холбогдсон"</item>
-    <item msgid="4042143101664725090">"Завсарлага"</item>
-    <item msgid="7664124146786465092">"Амжилтгүй"</item>
-  </string-array>
-  <string-array name="security_settings_premium_sms_values">
-    <item msgid="7389829271787670252">"Асуух"</item>
-    <item msgid="5077768429488260031">"Хэзээ ч зөвшөөрөхгүй"</item>
-    <item msgid="1417929597727989746">"Байнга зөвшөөрөх"</item>
-  </string-array>
-  <string-array name="ram_states">
-    <item msgid="7088762389498381203">"энгийн"</item>
-    <item msgid="4517779899383204000">"дунд зэргийн"</item>
-    <item msgid="406385694840950802">"бага"</item>
-    <item msgid="4212263919458209842">"эгзэгтэй"</item>
-  </string-array>
-  <string-array name="inversion_type_entries">
-    <item msgid="9312912686075064">"Стандарт"</item>
-    <item msgid="7316546394967864094">"Зөвхөн өнгө"</item>
-    <item msgid="5385613066929784179">"Зөвхөн утга"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 21f2235..2692cc7 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Тодорхойгүй алдаа"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Хүйтэн"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Блютүүт"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Ойролцоох бүх блютүүт төхөөрөмжид харагдах (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Ойролцоох бүх блютүүт төхөөрөмжид харагдах"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Бусад блютүүт төхөөрөмжүүдэд харагдахгүй"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Зөвхөн хослуулсан төхөөрөмжүүдэд харагдана"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Хослуулах хүсэлтүүд хүлээн авч байна (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Хослуулах хүсэлтүүд хүлээн авч байна"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Хослуулах хүсэлт хүлээж авахгүй"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Хослуулах хүсэлт хүлээж авахгүй"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Харагдалтын завсарлага"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Дуугаа залгахыг түгжих"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Дэлгэц түгжигдсэн үед блютүүт залгагчийг ашиглахаас сэргийлэх"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Салгах уу?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Энэ таныг дараах холболтоос салгах болно:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Цацалт"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"Идэвхтэй"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Идэвхгүй"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Профайлыг идэвхгүйжүүлэх үү?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Энэ &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;-н &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;-г идэвхгүйжүүлэх болно"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Холбогдсон"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Апп таны утсыг бусад блютүүт төхөөрөмжүүдэд <xliff:g id="TIMEOUT">%1$d</xliff:g> секундын турш харагдуулахыг хүсч байна."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Апп таны утсыг бусад блютүүт төхөөрөмжүүдэд харагдуулахыг хүсэж байна. Та үүнийг блютүүт тохиргооноос дараа нь өөрчилж болно."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Апп таны утсыг бусад блютүүт төхөөрөмжүүдэд харагдуулахыг хүсэж байна. Та үүнийг блютүүт тохиргооноос дараа нь өөрчилж болно."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> Блютүүт болон Блютүүт цацалтыг идэвхжүүлж ойролцоох төхөөрөмжүүдтэй холбогдохыг хүсэж байна. Та үүнийг дараа нь Блютүүт тохиргоон дотроос өөрчилж болно."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> Блютүүт болон Блютүүт цацалтыг идэвхжүүлж ойролцоох төхөөрөмжүүдтэй холбогдохыг хүсэж байна. Та үүнийг дараа нь Блютүүт тохиргоон дотроос өөрчилж болно."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Энэ функцыг идэвхжүүлсэн үед таны утас ойролцоох төхөөрөмжүүдтэй холбогдож чадна.\n\nЦацалтад бага хүчтэй Блютүүт дохио ашигладаг."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Апп блютүүтийг асааж таны таблетыг бусад төхөөрөмжүүдэд <xliff:g id="TIMEOUT">%1$d</xliff:g> секундын турш харагдуулахыг хүсч байна."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Апп блютүүтийг асааж таны утсыг бусад төхөөрөмжүүдэд <xliff:g id="TIMEOUT">%1$d</xliff:g> секундын турш харагдуулахыг хүсч байна."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Апп блютүүтийг асааж таны таблетыг бусад  төхөөрөмжүүдэд харагдуулахыг хүсэж байна. Та үүнийг блютүүт тохиргооноос дараа нь өөрчилж болно."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Апп блютүүтийг асааж таны утсыг бусад  төхөөрөмжүүдэд харагдуулахыг хүсэж байна. Та үүнийг Блютүүт тохиргооноос дараа нь өөрчилж болно."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> Блютүүт болон Блютүүт цацалтыг идэвхжүүлж ойролцоох төхөөрөмжүүдтэй холбогдохыг хүсэж байна. Та үүнийг дараа нь Блютүүт тохиргоон дотроос өөрчилж болно."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"<xliff:g id="APP_NAME">%1$s</xliff:g> Блютүүт болон Блютүүт цацалтыг идэвхжүүлж ойролцоох төхөөрөмжүүдтэй холбогдохыг хүсэж байна. Та үүнийг дараа нь Блютүүт тохиргоон дотроос өөрчилж болно."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Энэ функцыг идэвхжүүлсэн үед таны утас ойролцоох төхөөрөмжүүдтэй холбогдож чадна.\n\nЦацалтад бага хүчтэй Блютүүт дохио ашигладаг."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Блютүүтийг асааж байна…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Блютүүтийг унтрааж байна…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Авто-холболт"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Дуугаар залгах"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Таблет идэвхгүй"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Утас идэвхгүй"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Бүртгэгдээгүй"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Хэтрүүлэн тооцсон"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU нийт"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ил"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Сэрүүн байлгах"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Видео"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Асаалттай хугацаа"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Сигналгүй хугацаа"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Батерейны нийт багтаамж"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Тооцоолсон цахилгааны хэмжээ"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Хамгийн бага бодит цахилгаан хэрэглээ"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Хамгийн их бодит цахилгаан хэрэглээ"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Хүчээр зогсоох"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Апп мэдээлэл"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Апп тохиргоо"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Батерей хэмнэлтийн горимыг сонгох"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Апп зайны ашиглалтыг багасгах тохиргоог санал болгож болно"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Хэрэглэгчийн зарцуулсан зай"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Бүртгэгдээгүй цахилгаан ашиглалт"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Хэтрүүлэн тооцсон цахилгаан ашиглалт"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Салгаснаас хойш <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Хамгийн сүүлд тэжээлээс салгаснаас хойш <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Нийт ашиглалт"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 43db007..cf411a6 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ralat tidak diketahui"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Sejuk"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Kelihatan kpd semua peranti Bluetooth berdekatan (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Kelihatan kpd semua peranti Bluetooth berdekatan"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Tidak kelihatan kepada peranti Bluetooth lain"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Hanya kelihatan kepada peranti yg menjadi pasangan"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tamat masa kebolehlihatan"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Kunci dailan suara"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Halang penggunaan pendail bluetooth apabila skrin dikunci"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Putuskan sambungan?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tindakan ini akan menamatkan sambungan anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Penyiaran"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Lumpuhkan profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Hal ini akan melumpuhkan:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Bersambung"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Satu apl ingin menjadikan telefon anda kelihatan kepada peranti Bluetooth lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Satu apl mahu menjadikan tablet anda kelihatan kepada peranti Bluetooth lain. Anda boleh menukar tetapan ini dalam tetapan Bluetooth kemudian."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Satu apl mahu menjadikan telefon anda kelihatan kepada peranti Bluetooth lain. Anda boleh menukar tetapan ini dalam tetapan Bluetooth kemudian."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> mahu menghidupkan penyiaran Bluetooth untuk berkomunikasi dengan peranti lain yang berhampiran. Anda boleh menukar ini kemudian dalam tetapan Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> mahu menghidupkan Bluetooth dan penyiaran Bluetooth untuk berkomunikasi dengan peranti lain yang berhampiran. Anda boleh menukar ini kemudian dalam tetapan Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Apabila ciri ini dihidupkan, telefon anda boleh berkomunikasi dengan peranti lain yang berhampiran.\n\nPenyiaran menggunakan isyarat Bluetooth kuasa rendah."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Satu apl ingin menghidupkan Bluetooth dan menjadikan tablet anda kelihatan kepada peranti lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Satu apl ingin menghidupkan Bluetooth dan menjadikan telefon anda kelihatan kepada peranti lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Satu apl mahu menghidupkan Bluetooth dan menjadikan tablet anda kelihatan kepada peranti lain. Anda boleh menukar tetapan ini dalam tetapan Bluetooth kemudian."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Satu apl mahu menghidupkan Bluetooth dan menjadikan telefon anda kelihatan kepada peranti lain. Anda boleh menukar tetapan ini dalam tetapan Bluetooth kemudian."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> mahu menghidupkan penyiaran Bluetooth untuk berkomunikasi dengan peranti lain yang berhampiran. Anda boleh menukar ini kemudian dalam tetapan Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Apabila ciri ini dihidupkan, telefon anda boleh berkomunikasi dengan peranti lain yang berhampiran.\n\nPenyiaran menggunakan isyarat Bluetooth kuasa rendah."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Menghidupkan Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Mematikan Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Autosambung"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Panggilan suara"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet melahu"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon melahu"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Tidak dapat dikesan"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Terlebih kira"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Jumlah CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Kekal berjaga"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Masa hidup"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Masa tanpa isyarat"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Jumlah kapasiti bateri"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Kuasa yang dikira"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Kuasa sebenar minimum"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Kuasa sebenar maksimum"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Henti paksa"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Maklumat aplikasi"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Tetapan aplikasi"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pilih mod penjimatan bateri"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikasi ini mungkin menawarkan tetapan untuk mengurangkan penggunaan bateri"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateri digunakan oleh pengguna"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Penggunaan kuasa tidak dapat dikesan"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan kuasa terlebih kira"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak palam dicabut"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Semasa kali terakhir palam dicabut untuk <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Jumlah penggunaan"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f1ada6e..de492d4 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ukjent feil"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kald"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Synlig for alle Bluetooth-enheter i nærheten (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Synlig for alle Bluetooth-enheter i nærheten"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ikke synlig for andre Bluetooth-enheter"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Synlig bare for sammenkoblede enheter"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tidsavbrudd for synlighet"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lås taleanrop"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Forhindrer bruk av Bluetooth-telefon når skjermen er låst"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vil du koble fra?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dette vil avslutte tilkoblingen til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Kringkasting"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vil du deaktivere profilen?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Dette deaktiverer:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Tilkoblet"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"En app ønsker å gjøre telefonen din synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"En app ønsker å gjøre nettbrettet ditt synlig for andre Bluetooth-enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"En app ønsker å gjøre telefonen din synlig for andre Bluetooth-enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å slå på Bluetooth-kringkasting for å kommunisere med andre enheter i nærheten. Du kan endre dette senere i Bluetooth-innstillingene."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å slå på Bluetooth og Bluetooth-kringkasting for å kommunisere med andre enheter i nærheten. Du kan endre dette senere i Bluetooth-innstillingene."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Når denne funksjonen er aktivert, kan telefonen kommunisere med andre enheter i nærheten.\n\nKringkasting bruker Bluetooth-signaler med lavt strømforbruk."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"En app ønsker å slå på Bluetooth og gjøre nettbrettet ditt synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"En app ønsker å slå på Bluetooth og gjøre telefonen din synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"En app ønsker å slå på Bluetooth og gjøre nettbrettet ditt synlig for andre enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"En app ønsker å slå på Bluetooth og gjøre telefonen din synlig for andre enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å slå på Bluetooth-kringkasting for å kommunisere med andre enheter i nærheten. Du kan endre dette senere i Bluetooth-innstillingene."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Når denne funksjonen er aktivert, kan telefonen kommunisere med andre enheter i nærheten.\n\nKringkasting bruker Bluetooth-signaler med lavt strømforbruk."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Slår på Bluetooth …"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Slår av Bluetooth …"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatisk tilkobling"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Telefonsamtaler"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Nettbrettet ikke i bruk"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen ikke i bruk"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Ikke-beregnet"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Overberegnet"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Prosessor totalt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Prosessor i forgrunnen"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Behold aktiv"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tid på"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tid uten signal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Total batterikapasitet"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Beregnet batteribruk"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Minimal faktisk batteribruk"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Maksimal faktisk batteribruk"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Tving avslutning"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Info om appen"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Innstillinger for app"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Velg batterisparingsmodus"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Appen kan ha innstillinger som kan redusere batteribruken"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batteri brukt av brukeren"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Ikke-beregnet batteribruk"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overberegnet batteribruk"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden strømmen ble frakoblet"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siste gang uten strøm i <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total bruk"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3de3e8c..35efa21 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Onbekende fout"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Koud"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Zichtbaar voor alle Bluetooth-apparaten in de buurt (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Zichtbaar voor alle Bluetooth-apparaten in de buurt"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Niet zichtbaar voor andere Bluetooth-apparaten"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Alleen zichtbaar voor gekoppelde apparaten"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Koppelingsverzoeken accepteren (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Koppelingsverzoeken accepteren"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Koppelingsverzoeken niet accepteren"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Koppelingsverzoeken niet accepteren"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Zichtbaarheid uitstellen"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Spraakkeuze vergrendelen"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Gebruik van de Bluetooth-dialer voorkomen wanneer het scherm is vergrendeld"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ontkoppelen?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hierdoor wordt uw verbinding met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; verbroken"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitzending"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"Aan"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Uit"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profiel uitschakelen?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Dit zorgt voor het uitschakelen van :&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Van:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Verbonden"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Een app wil uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere Bluetooth-apparaten."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Een app wil uw tablet zichtbaar maken voor andere Bluetooth-apparaten. U kunt dit later wijzigen in de Bluetooth-instellingen."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Een app wil uw telefoon zichtbaar maken voor andere Bluetooth-apparaten. U kunt dit later wijzigen in de Bluetooth-instellingen."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth-uitzending inschakelen om te communiceren met andere apparaten in de buurt. U kunt dit later wijzigen in \'Bluetooth-instellingen\'."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth en Bluetooth-uitzending inschakelen om te communiceren met andere apparaten in de buurt. U kunt dit later wijzigen in \'Bluetooth-instellingen\'."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Als deze functie is ingeschakeld, kan uw telefoon communiceren met andere apparaten in de buurt.\n\nUitzending gebruikt Bluetooth-signalen met laag energieverbruik."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Een app wil Bluetooth inschakelen en uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere apparaten."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Een app wil Bluetooth inschakelen en uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere apparaten."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Een app wil Bluetooth inschakelen en uw tablet zichtbaar maken voor andere apparaten. U kunt dit later wijzigen in de Bluetooth-instellingen."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Een app wil Bluetooth inschakelen en uw telefoon zichtbaar maken voor andere apparaten. U kunt dit later wijzigen in de Bluetooth-instellingen."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth-uitzending inschakelen om te communiceren met andere apparaten in de buurt. U kunt dit later wijzigen in \'Bluetooth-instellingen\'."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth en Bluetooth-uitzending inschakelen om te communiceren met andere apparaten in de buurt. U kunt dit later wijzigen in \'Bluetooth-instellingen\'."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Als deze functie is ingeschakeld, kan uw telefoon communiceren met andere apparaten in de buurt.\n\nUitzending gebruikt Bluetooth-signalen met laag energieverbruik."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth inschakelen.."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth uitschakelen…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatisch verbinding maken"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Spraakoproepen"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactief"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefoon inactief"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Onverklaard"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Te hoog berekend"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU op voorgrond"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ingeschakeld houden"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tijd actief"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tijd zonder signaal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Totale capaciteit van de accu"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Berekend stroomgebruik"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Min. werkelijk stroomgebruik"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Max. werkelijk stroomgebruik"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Gedwongen stoppen"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"App-info"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"App-instellingen"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Accubesparingsmodus selecteren"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"De app kan instellingen aanbieden om het accugebruik te beperken"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Accu gebruikt door gebruiker"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Onverklaard stroomgebruik"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Te hoog berekend stroomgebruik"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sinds losgekoppeld"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sinds laatst losgekoppeld voor <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Gebruikstotalen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 040afda..d3b1c5c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nieznany błąd"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Zimna"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Widoczne dla wszystkich urządzeń Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Widoczne dla wszystkich urządzeń Bluetooth"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Niewidoczne dla innych urządzeń Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Widoczne tylko dla urządzeń sparowanych"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Żądania parowania są akceptowane (przez <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Żądania parowania są akceptowane"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Żądania parowania nie są akceptowane"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Żądania parowania nie są akceptowane"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Czas widoczności"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zablokuj wybieranie głosowe"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zapobiegaj używaniu wybierania Bluetooth, gdy ekran jest zablokowany"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Rozłączyć?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Spowoduje to zakończenie połączenia z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisja"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"Wł."</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Wył."</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wyłączyć profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Spowoduje to wyłączenie profilu:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Urządzenie:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Połączony"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikacja chce ustawić Twój telefon jako wykrywalny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikacja chce ustawić Twój tablet jako wykrywalny dla innych urządzeń Bluetooth. Później możesz to zmienić w ustawieniach Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikacja chce ustawić Twój telefon jako wykrywalny dla innych urządzeń Bluetooth. Później możesz to zmienić w ustawieniach Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> chce włączyć transmisję Bluetooth, by komunikować się z innymi urządzeniami w pobliżu. Możesz to potem zmienić w ustawieniach Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> chce włączyć Bluetooth i transmisję Bluetooth, by komunikować się z innymi urządzeniami w pobliżu. Możesz to potem zmienić w ustawieniach Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Gdy ta funkcja jest włączona, Twój telefon może komunikować się z innymi urządzeniami w pobliżu.\n\nFunkcja wykorzystuje sygnały Bluetooth małej mocy."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikacja chce włączyć Bluetooth i ustawić tablet jako wykrywalny dla innych urządzeń przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikacja chce włączyć Bluetooth i ustawić telefon jako wykrywalny dla innych urządzeń przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikacja chce włączyć Bluetooth i ustawić Twój tablet jako wykrywalny dla innych urządzeń. Później możesz to zmienić w ustawieniach Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikacja chce włączyć Bluetooth i ustawić Twój telefon jako wykrywalny dla innych urządzeń. Później możesz to zmienić w ustawieniach Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> chce włączyć transmisję Bluetooth, by komunikować się z innymi urządzeniami w pobliżu. Możesz to potem zmienić w ustawieniach Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"<xliff:g id="APP_NAME">%1$s</xliff:g> chce włączyć Bluetooth i transmisję Bluetooth, by komunikować się z innymi urządzeniami w pobliżu. Możesz to potem zmienić w ustawieniach Bluetooth."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Gdy ta funkcja jest włączona, Twój telefon może komunikować się z innymi urządzeniami w pobliżu.\n\nFunkcja wykorzystuje sygnały Bluetooth małej mocy."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Włączanie Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Wyłączanie Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Połącz automatycznie"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Połączenia głosowe"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet nieaktywny"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon nieaktywny"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Nierozliczone"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Obliczone z nadmiarem"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU łącznie"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU (pierwszy plan)"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Utrzymanie aktywności"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Wideo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Czas włączenia"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Czas braku sygnału"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Całkowita pojemność baterii"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Obliczone zużycie energii"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Min. rzeczywiste zużycie energii"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Maks. rzeczywiste zużycie energii"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Wymuś zatrzymanie"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informacje o aplikacji"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Ustawienia aplikacji"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Wybierz tryb oszczędzania baterii"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikacja może oferować ustawienia pozwalające zmniejszyć użycie baterii."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Użycie baterii przez użytkownika"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Nierozliczone zużycie energii"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zużycie energii obliczone z nadmiarem"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odłączenia"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ostatnio odłączony na <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Łączne użycie"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5def7b9..c9fb7b1 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erro desconhecido"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Frio"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visível p/ tds aparelhos Bluetooth próximos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visível para tds os aparelhos Bluetooth nas prox."</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Não visível a outros aparelhos Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visível apenas para aparelhos sincronizados"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tempo limite de visibilidade"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcação por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Evitar a utilização do telefone Bluetooth quando o ecrã está bloqueado"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desligar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isto terminará a sua ligação com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Difusão"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desativar perfil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Isto desativará:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Do:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ligado"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Uma aplicação pretende tornar o seu telemóvel visível para outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Uma aplicação pretende tornar o seu tablet visível para outros dispositivos Bluetooth. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Uma aplicação pretende tornar o seu telemóvel visível para outros dispositivos Bluetooth. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"A aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> pretende ativar a difusão via Bluetooth para comunicar com outros dispositivos próximos. É possível alterar esta opção posteriormente nas definições de Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"A aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> pretende ativar o Bluetooth e a difusão via Bluetooth para comunicar com outros dispositivos próximos. É possível alterar esta opção posteriormente nas definições de Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Com esta funcionalidade ativada, o telemóvel pode comunicar com outros dispositivos próximos.\n\nA difusão utiliza sinais de Bluetooth de baixo consumo."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Uma aplicação pretende ativar o Bluetooth e tornar o seu tablet visível para outros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Uma aplicação pretende ativar o Bluetooth e tornar o seu telemóvel visível para outros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Uma aplicação pretende ativar o Bluetooth e tornar o seu tablet visível para outros dispositivos. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Uma aplicação pretende ativar o Bluetooth e tornar o seu telemóvel visível para outros dispositivos. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"A aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> pretende ativar a difusão via Bluetooth para comunicar com outros dispositivos próximos. É possível alterar esta opção posteriormente nas definições de Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Com esta funcionalidade ativada, o telemóvel pode comunicar com outros dispositivos próximos.\n\nA difusão utiliza sinais de Bluetooth de baixo consumo."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"A ligar o Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desativar o Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Ligação automática"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactivo"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone inactivo"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Não contabilizada"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Contabilizada em excesso"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primeiro plano da CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Manter desperto"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Hora activada"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tempo sem sinal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Capacidade da bateria total"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Energia calculada"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Energia real mínima"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Energia real máxima"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forçar paragem"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informações da aplicação"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Definições da aplicação"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecionar o modo de poupança de bateria"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"A aplicação pode sugerir definições para reduzir a utilização da bateria"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateria usada pelo utilizador"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Utilização de energia não contabilizada"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilização de energia contabilizada em excesso"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desligado"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Desde a última vez que foi desligado por <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totais de utilização"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d02cd46..ba1e1be 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erro desconhecido"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Menos vistos"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visível para todos os disp. Bluetooth próx. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visível para todos os dispos. Bluetooth próximos"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Não visível para outros dispositivos Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visível somente para dispositivos pareados"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tempo limite de visibilidade"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear discagem por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir o uso do discador Bluetooth quando a tela estiver bloqueada."</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desconectar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isso encerrará sua conexão com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmissão"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desativar perfil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Essa ação desativará o <xliff:g id="PROFILE_NAME">%1$s</xliff:g> do <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Um aplicativo quer tornar seu telefone visível para outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Um aplicativo quer tornar seu tablet visível para outros dispositivos Bluetooth. Você pode alterar esta opção a qualquer momento nas configurações do Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Um aplicativo quer tornar seu telefone visível para outros dispositivos Bluetooth. Você pode alterar esta opção a qualquer momento nas configurações do Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> deseja ativar a transmissão via Bluetooth para se comunicar com outros dispositivos próximos. Será possível alterar esta opção posteriormente nas configurações do Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> deseja ativar o Bluetooth e a transmissão via Bluetooth para se comunicar com outros dispositivos próximos. Será possível alterar esta opção posteriormente nas configurações do Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Quando este recurso é ativado, o telefone pode se comunicar com outros dispositivos próximos.\n\nA transmissão usa sinais de Bluetooth de baixo consumo."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Um aplicativo quer ativar o Bluetooth e tornar seu tablet visível para outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Um aplicativo quer ativar o Bluetooth e tornar seu telefone visível para outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Um aplicativo quer ativar o Bluetooth e tornar seu tablet visível para outros dispositivos. Você pode alterar esta opção a qualquer momento nas configurações do Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Um aplicativo quer ativar o Bluetooth e tornar seu telefone visível para outros dispositivos. Você pode alterar esta opção a qualquer momento nas configurações do Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> deseja ativar a transmissão via Bluetooth para se comunicar com outros dispositivos próximos. Será possível alterar esta opção posteriormente nas configurações do Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Quando este recurso é ativado, o telefone pode se comunicar com outros dispositivos próximos.\n\nA transmissão usa sinais de Bluetooth de baixo consumo."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Ativando Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desligar o Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conexão automática"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ocioso"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone ocioso"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Não estimado"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Superestimado"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU prioritária"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Permanecer ativo"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tempo ligado"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Horário sem o sinal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Capacidade total da bateria"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Energia computada"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Energia real mínima"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Energia real máxima"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forçar parada"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informações do app"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Configurações do aplicativo"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecionar modo de economia de bateria"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"O aplicativo pode oferecer configurações para reduzir o uso da bateria"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateria utilizada pelo usuário"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consumo de energia não estimado"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desconectado"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Quando foi desconectado pela última vez para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total de uso"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 8fd211d..fddb1ec 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -131,13 +131,13 @@
     <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
     <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
     <skip />
-    <!-- no translation found for bluetooth_is_discoverable_always (2849387702249327748) -->
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
     <skip />
-    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
     <skip />
-    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
     <skip />
     <!-- no translation found for bluetooth_visibility_timeout (8002247464357005429) -->
     <skip />
@@ -163,6 +163,10 @@
     <skip />
     <!-- no translation found for bluetooth_broadcasting (16583128958125247) -->
     <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <!-- no translation found for bluetooth_disable_profile_title (5916643979709342557) -->
     <skip />
     <!-- no translation found for bluetooth_disable_profile_message (2895844842011809904) -->
@@ -206,20 +210,16 @@
     <skip />
     <!-- no translation found for bluetooth_ask_lasting_discovery (6487606808683607975) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_start_broadcast (3535628155254187911) -->
-    <skip />
-    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (8810858601242763295) -->
-    <skip />
-    <!-- no translation found for bluetooth_broadcasting_explaination (4249322115655011799) -->
-    <skip />
-    <!-- no translation found for bluetooth_ask_enablement_and_discovery (3346529092809011149) -->
-    <skip />
-    <!-- no translation found for bluetooth_ask_enablement_and_discovery (4724094889807196118) -->
-    <skip />
     <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (989613204829097159) -->
     <skip />
     <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (6671615712909139801) -->
     <skip />
+    <!-- no translation found for bluetooth_ask_start_broadcast (3535628155254187911) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_explaination (4249322115655011799) -->
+    <skip />
     <!-- no translation found for bluetooth_turning_on (4850574877288036646) -->
     <skip />
     <!-- no translation found for bluetooth_turning_off (2337747302892025192) -->
@@ -2384,6 +2384,10 @@
     <!-- no translation found for power_idle (4612478572401640759) -->
     <skip />
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inactiv"</string>
+    <!-- no translation found for power_unaccounted (4835429811853042257) -->
+    <skip />
+    <!-- no translation found for power_overcounted (2762354976171358445) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU - Durada totala"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU - Fund davant"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Betg sa durmentar"</string>
@@ -2405,6 +2409,14 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Temp activ"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Temp senza signal"</string>
+    <!-- no translation found for usage_type_total_battery_capacity (3798285287848675346) -->
+    <skip />
+    <!-- no translation found for usage_type_computed_power (3665248793473498804) -->
+    <skip />
+    <!-- no translation found for usage_type_min_actual_power (4772874833688090017) -->
+    <skip />
+    <!-- no translation found for usage_type_max_actual_power (429012562553903697) -->
+    <skip />
     <string name="battery_action_stop" msgid="649958863744041872">"Sfurzar da fermar"</string>
     <!-- no translation found for battery_action_app_details (7861051816778419018) -->
     <skip />
@@ -2443,6 +2455,12 @@
     <skip />
     <!-- no translation found for battery_desc_users (7682989161885027823) -->
     <skip />
+    <!-- no translation found for battery_desc_unaccounted (1653798876416893745) -->
+    <skip />
+    <!-- no translation found for battery_desc_overcounted (5481865509489228603) -->
+    <skip />
+    <!-- no translation found for mah (95245196971239711) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> dapi la deconnexiun"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Dapi la davosa deconnexiun (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Consum en total"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e146593..4f56210 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Eroare necunoscută"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Golită"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vizibil pt. dispoz. Bluetooth din aprop. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vizibil pt. toate disp. Bluetooth din apropiere"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nu este vizibil pentru alte dispozitive Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vizibil numai pe dispozitivele asociate"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timp limită pentru vizibilitate"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Blocaţi apelarea vocală"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Împiedicaţi apelarea prin Bluetooth când este blocat ecranul"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Deconectaţi?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Astfel se va încheia conexiunea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmitere"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Dezactivaţi profilul?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Această acţiune va dezactiva:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;de pe:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectat"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"O aplicație încearcă să facă telefonul vizibil pentru alte gadgeturi Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"O aplicație încearcă să facă tableta vizibilă pentru alte gadgeturi Bluetooth. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"O aplicație încearcă să facă telefonul vizibil pentru alte gadgeturi Bluetooth. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> dorește să activeze transmiterea prin Bluetooth pentru a comunica cu alte dispozitive din apropiere. Puteți modifica ulterior această setare, în setările Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> dorește să activeze Bluetooth și transmiterea prin Bluetooth pentru a comunica cu alte dispozitive din apropiere. Puteți modifica ulterior această setare, în setările Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Când această funcție este activată, telefonul dvs. poate comunica cu alte dispozitive din apropiere.\n\nTransmiterea utilizează semnale Bluetooth cu consum scăzut de energie."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"O aplicație încearcă să activeze Bluetooth și să facă tableta vizibilă pentru alte gadgeturi pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"O aplicație încearcă să activeze Bluetooth și să facă telefonul vizibil pentru alte gadgeturi pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"O aplicație încearcă să activeze Bluetooth și să facă tableta vizibilă pentru alte gadgeturi. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"O aplicație încearcă să activeze Bluetooth și să facă telefonul vizibil pentru alte gadgeturi. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> dorește să activeze transmiterea prin Bluetooth pentru a comunica cu alte dispozitive din apropiere. Puteți modifica ulterior această setare, în setările Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Când această funcție este activată, telefonul dvs. poate comunica cu alte dispozitive din apropiere.\n\nTransmiterea utilizează semnale Bluetooth cu consum scăzut de energie."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Se activează Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Se dezactivează Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conectare automată"</string>
@@ -1512,6 +1519,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Apeluri vocale"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tableta inactivă"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inactiv"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Neînregistrat"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Supraevaluat"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total procesor"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor în prim plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Păstrare în activitate"</string>
@@ -1527,6 +1536,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Durată de activitate"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Durată fără semnal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Capacitatea totală a bateriei"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Consumul calculat"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Consumul real minim"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Consumul real maxim"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Opriţi forţat"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informaţii despre aplicaţie"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Setări aplicaţii"</string>
@@ -1550,6 +1563,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selectați modul de economisire a bateriei"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplicaţia poate oferi setări pentru reducerea utilizării bateriei"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterie utilizată de utilizator"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consumul neînregistrat al bateriei"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumul supraevaluat al bateriei"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> de la deconectare"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"De la ultima deconectare pentru <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totaluri privind utilizarea"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9ac51f4..a80ab58 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Неизвестная ошибка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Холодная"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Время видимости для устройств Bluetooth: <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Отображать для ближайших устройств Bluetooth"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Не отображать для других Bluetooth-устройств"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Доступно только для подключенных устройств"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Тайм-аут видимости"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заблокировать голосовой набор"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратить использование телефона Bluetooth, когда экран заблокирован"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Отключиться?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Произойдет разъединение с устройством &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Передача данных"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Отключить профиль?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Профиль&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;будет отключен от устройства&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Подключено"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Одному из приложений требуется, чтобы ваш телефон был доступен для поиска через Bluetooth на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Одному из приложений требуется сделать ваш планшетный ПК доступным для поиска через Bluetooth на других устройствах. Позже эти настройки можно будет изменить."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Одному из приложений требуется сделать ваш телефон доступным для поиска через Bluetooth на других устройствах. Позже эти настройки можно будет изменить."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> собирается включить Bluetooth, чтобы установить соединение с другими устройствами. Эту функцию можно в любой момент отключить в настройках Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> собирается включить Bluetooth, чтобы установить соединение с другими устройствами. Эту функцию можно в любой момент отключить в настройках Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Ваш телефон сможет устанавливать соединение с другими устройствами поблизости.\n\nПри передаче данных используется сигнал Bluetooth с низким энергопотреблением."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Одному из приложений требуется включить Bluetooth и сделать ваш планшетный ПК доступным для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Одному из приложений требуется включить Bluetooth и сделать ваш телефон доступным для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Одному из приложений требуется включить Bluetooth и сделать ваш планшетный ПК доступным для поиска на других устройствах. Позже эти настройки можно будет изменить."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Одному из приложений требуется включить Bluetooth и сделать ваш телефон доступным для поиска на других устройствах. Позже эти настройки можно будет изменить."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> собирается включить Bluetooth, чтобы установить соединение с другими устройствами. Эту функцию можно в любой момент отключить в настройках Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Ваш телефон сможет устанавливать соединение с другими устройствами поблизости.\n\nПри передаче данных используется сигнал Bluetooth с низким энергопотреблением."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Включение Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Отключение Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Автоматическое подключение"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Голосовые вызовы"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Планшетный ПК в режиме ожидания"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Режим ожидания"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Неучтенное"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Переучтенное"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"ЦП – всего"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ЦП – акт. режим"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Акт. режим"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Видео"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Время работы"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Время отсутствия сигнала"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Емкость батареи"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Расчетное энергопотребление"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Минимальное энергопотребление"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Максимальное энергопотребление"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Остановить"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"О приложении"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Настройки приложения"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Выберите режим экономии заряда батареи"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"В программе могут быть настройки режима энергосбережения"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Использование батареи пользователем"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Неучтенное энергопотребление"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Переучтенное энергопотребление"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА·ч"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> с момента отключения от питания"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"С последнего отключения <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Всего"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 8e9f868..d34bec5 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Neznáma chyba"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Studené"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Viditeľné pre všetky okolité zariadenia Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Viditeľné pre všetky okolité zariadenia Bluetooth"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Neviditeľné pre ostatné zariadenia Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Viditeľné len pre spárované zariadenia"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časový limit viditeľnosti"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Uzamknúť hlasové vytáčanie"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabrániť použitiu vytáčania Bluetooth pri uzamknutej obrazovke"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Odpojiť?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Táto akcia ukončí vaše pripojenie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Vysielanie"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Zakázať profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Táto akcia zakáže profil <xliff:g id="PROFILE_NAME">%1$s</xliff:g> a zariadenie <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Pripojené"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s prepnúť váš telefón do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikácia chce váš tablet prepnúť do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth. Toto nastavenie môžete neskôr zmeniť v nastaveniach rozhrania Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikácia chce váš telefón prepnúť do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth. Toto nastavenie môžete neskôr zmeniť v nastaveniach rozhrania Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť vysielanie prostredníctvom rozhrania Bluetooth, aby mohla komunikovať s ostatnými zariadeniami v blízkosti. Toto nastavenie môžete neskôr zmeniť v sekcii Nastavenia Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť funkciu Bluetooth a vysielanie prostredníctvom rozhrania Bluetooth, aby mohla komunikovať s ostatnými zariadeniami v blízkosti. Toto nastavenie môžete neskôr zmeniť v sekcii Nastavenia Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Keď je táto funkcia zapnutá, váš telefón môže komunikovať s ostatnými zariadeniami v blízkosti.\n\nVysielanie používa signály Bluetooth s nízkou spotrebou energie."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s zapnúť rozhranie Bluetooth a prepnúť váš tablet do viditeľného režimu."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s zapnúť rozhranie Bluetooth a prepnúť váš telefón do viditeľného režimu."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikácia chce zapnúť rozhranie Bluetooth a prepnúť váš tablet do režimu, v ktorom bude viditeľný pre ostatné zariadenia. Toto nastavenie môžete neskôr zmeniť v nastaveniach rozhrania Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikácia chce zapnúť rozhranie Bluetooth a prepnúť váš telefón do režimu, v ktorom bude viditeľný pre ostatné zariadenia. Toto nastavenie môžete neskôr zmeniť v nastaveniach rozhrania Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť vysielanie prostredníctvom rozhrania Bluetooth, aby mohla komunikovať s ostatnými zariadeniami v blízkosti. Toto nastavenie môžete neskôr zmeniť v sekcii Nastavenia Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Keď je táto funkcia zapnutá, váš telefón môže komunikovať s ostatnými zariadeniami v blízkosti.\n\nVysielanie používa signály Bluetooth s nízkou spotrebou energie."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Zapnúť Bluetooth?"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vypínanie Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automaticky pripojiť"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet je nečinný"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefón v stave nečinnosti"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Neznáma"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Nadsadená"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Doba prevádzky procesora"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popredí"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázať režim spánku"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Doba zapnutia"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Doba bez signálu"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Celková kapacita batérie"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Vypočítaná spotreba energie"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Minimálna skutočná spotreba energie"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Maximálna skutočná spotreba energie"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Vynútiť zastavenie"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informácie o aplikácii"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Nastavenia aplikácie"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Vyberte režim úspory batérie"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Táto aplikácia môže ponúkať nastavenia na zníženie používania batérie"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Využitie batérie používateľom"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neznáma spotreba energie"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadsadená spotreba energie"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojenia"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Pri poslednom odpojení pre <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Využitie batérie celkom"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b3f2a3e..6d0c8ec 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Neznana napaka"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Hladno"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vidno vsem napravam Bluetooth v bližini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vidno vsem napravam Bluetooth v bližini"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ni vidno drugim napravam Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vidno samo seznanjenim napravam"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Sprejemanje zahtev za seznanjanje (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Sprejemanje zahtev za seznanjanje"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Zahteve za seznanjanje se ne sprejemajo"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Zahteve za seznanjanje se ne sprejemajo"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časovna omejitev vidnosti"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zakleni glasovno klicanje"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prepreči uporabo telefona Bluetooth, kadar je zaslon zaklenjen"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Želite prekiniti povezavo?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"S tem bo prekinjena povezava z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Oddajanje"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"Vklopljeno"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Izklopljeno"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Želite onemogočiti profil?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"S tem boste onemogočili:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Povezava je vzpostavljena"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikacija želi, da lahko druge naprave Bluetooth vidijo vaš telefon toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikacija želi omogočiti, da lahko druge naprave Bluetooth vidijo vaš tablični računalnik. To lahko pozneje spremenite v nastavitvah Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikacija želi omogočiti, da lahko druge naprave Bluetooth vidijo vaš telefon. To lahko pozneje spremenite v nastavitvah Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi vklopiti oddajanje Bluetooth za komuniciranje z drugimi napravami v bližini. To lahko pozneje spremenite v nastavitvah za Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi vklopiti Bluetooth in oddajanje Bluetooth za komuniciranje z drugimi napravami v bližini. To lahko pozneje spremenite v nastavitvah za Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Ko je ta funkcija vklopljena, lahko telefon komunicira z drugimi napravami v bližini.\n\nOddajanje uporablja signale Bluetooth majhne moči."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikacija želi vklopiti Bluetooth in omogočiti, da lahko druge naprave vidijo vaš tablični računalnik toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikacija želi vklopiti Bluetooth in omogočiti, da lahko druge naprave vidijo vaš telefon toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikacija želi vklopiti Bluetooth in omogočiti, da lahko druge naprave vidijo vaš tablični računalnik. To lahko pozneje spremenite v nastavitvah Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikacija želi vklopiti Bluetooth in omogočiti, da lahko druge naprave vidijo vaš telefon. To lahko pozneje spremenite v nastavitvah Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi vklopiti oddajanje Bluetooth za komuniciranje z drugimi napravami v bližini. To lahko pozneje spremenite v nastavitvah za Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi vklopiti Bluetooth in oddajanje Bluetooth za komuniciranje z drugimi napravami v bližini. To lahko pozneje spremenite v nastavitvah za Bluetooth."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Ko je ta funkcija vklopljena, lahko telefon komunicira z drugimi napravami v bližini.\n\nOddajanje uporablja signale Bluetooth majhne moči."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Vklop Bluetootha…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Izklop Bluetootha…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Samodejno poveži"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Glasovni klici"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablični računalnik nedejaven"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon je nedejaven"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Nevidentirano"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Preveč šteto"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Skupni čas za CPE"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ospredje CPE"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ohrani odklenjen zaslon"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Čas vklopa"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Čas brez signala"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Skupna zmogljivost akumulatorja"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Izračunana energija"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Najmanjša dejanska energija"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Največja dejanska energija"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Prisilna ustavitev"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Podatki o aplikaciji"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Nastavitve programov"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Izberite način za varčevanje z energijo akumulatorja"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Program morda omogoča nastavitve za zmanjšanje porabe energije"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Energija, ki jo je porabil uporabnik"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neevidentirana uporaba energije"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Preveč šteta uporaba energije"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odklopa"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Po zadnjem odklopu za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Skupna poraba"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e62abdd..17a524c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Непозната грешка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Незанимљиво"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видљиво за све оближње Bluetooth уређаје (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видљиво за све оближње Bluetooth уређаје"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Није видљиво за друге Bluetooth уређаје"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видљиво само за упарене уређаје"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Време чекања за видљивост"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Закључај говорно бирање"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Спречи коришћење bluetooth програма за бирање бројева када је екран закључан"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Желите ли да прекинете везу?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Овим ћете прекинути везу са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Емитовање"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Желите ли да онемогућите профил?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Овим онемогућавате:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Са уређаја:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Повезано"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Апликација жели да учини телефон видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Апликација жели да учини таблет видљивим за друге Bluetooth уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Апликација жели да учини телефон видљивим за друге Bluetooth уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> жели да укључи емитовање преко Bluetooth-а ради комуникације са другим оближњим уређајима. Ово можете да промените касније у подешавањима Bluetooth-а."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> жели да укључи Bluetooth и емитовање преко Bluetooth-а ради комуникације са другим оближњим уређајима. Ово можете да промените касније у подешавањима Bluetooth-а."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Када је ова функција укључена, телефон може да комуницира са другим уређајима у близини.\n\nЕмитовање користи Bluetooth сигнале са малом потрошњом енергије."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Апликација жели да укључи Bluetooth и учини таблет видљивим за друге уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Апликација жели да укључи Bluetooth и учини телефон видљивим за друге уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Апликација жели да укључи Bluetooth и учини таблет видљивим за друге уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Апликација жели да укључи Bluetooth и учини телефон видљивим за друге уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> жели да укључи емитовање преко Bluetooth-а ради комуникације са другим оближњим уређајима. Ово можете да промените касније у подешавањима Bluetooth-а."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Када је ова функција укључена, телефон може да комуницира са другим уређајима у близини.\n\nЕмитовање користи Bluetooth сигнале са малом потрошњом енергије."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Укључивање Bluetooth-а…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Искључивање Bluetooth-а…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Аутоматско повезивање"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Гласовни позиви"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Таблет је у стању мировања"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Телефон у мировању"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Непозната"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Прекомерно израчуната"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Укупно коришћење процесора"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор у предњем плану"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Задржи ван стања спавања"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Видео"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Трајање укључења"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Време без сигнала"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Укупан капацитет батерије"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Израчуната енергија"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Минимална реална енергија"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Максимална реална енергија"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Принудно заустави"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Информације о апликацији"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Подешавања апликације"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Изаберите режим уштеде батерије"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Апликација може да понуди подешавања како би се смањило коришћење батерије"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Батерија коју користи корисник"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Непозната потрошња батерије"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Прекомерно израчуната потрошња енергије"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> од искључивања"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Током последњег искључивања за <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Укупно коришћено"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 55b42c7..ce204c5 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Okänt fel"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Sval"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Synlig för alla Bluetooth-enheter i närheten (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visas för alla närliggande Bluetooth-enheter"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Inte synlig för andra Bluetooth-enheter"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Bara synlig för kopplade enheter"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tidsgräns för synlighet"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Röstuppringning med låsskärm"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Förhindra att bluetooth-uppringningsfunktionen används när skärmen är låst"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vill du koppla från?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Detta avslutar din anslutning till:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Bluetooth-sändning"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vill du inaktivera profilen?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Följande kommer att inaktiveras:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;från:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ansluten"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"En app vill göra din mobil synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"En app vill göra din surfplatta synlig för andra Bluetooth-enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"En app vill göra din mobil synlig för andra Bluetooth-enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill aktivera sändning via Bluetooth för att kommunicera med andra enheter i närheten. Du kan ändra detta senare i Bluetooth-inställningarna."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill aktivera Bluetooth och sändning via Bluetooth för att kommunicera med andra enheter i närheten. Du kan ändra detta senare i Bluetooth-inställningarna."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"När funktionen har aktiverats kan telefonen kommunicera med andra enheter i närheten.\n\nSändningen använder Bluetooth-signaler med låg energiförbrukning."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"En app vill aktivera Bluetooth och göra din surfplatta synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"En app vill aktivera Bluetooth och göra din mobil synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"En app vill aktivera Bluetooth och göra din surfplatta synlig för andra enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"En app vill aktivera Bluetooth och göra din mobil synlig för andra enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill aktivera sändning via Bluetooth för att kommunicera med andra enheter i närheten. Du kan ändra detta senare i Bluetooth-inställningarna."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"När funktionen har aktiverats kan telefonen kommunicera med andra enheter i närheten.\n\nSändningen använder Bluetooth-signaler med låg energiförbrukning."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth aktiveras"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vill du stänga av Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatisk anslutning"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Röstsamtal"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Surfplattan är inaktiv"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen är inaktiv"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Oräknad"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"För högt räknad"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU totalt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU i förgrunden"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Behåll aktiv"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tid aktiverad"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tid utan täckning"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Total batterikapacitet"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Beräknad strömmängd"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Lägst strömmängd"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Högst strömmängd"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Tvingad avslutning"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Info om appen"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Appinställningar"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Välj batterisparläge"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Appen erbjuder eventuellt inställningar som minskar batteriförbrukningen"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batteri som förbrukats av användaren"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Oräknad strömförbrukning"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"För högt räknad strömförbrukning"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedan bortkoppling"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sedan senaste bortkoppling <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total förbrukning"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 25de4d9..052dc8f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Hitilafu isiyojulikana"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Baridi"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Inaonekana kwa zote zilizokaribu na vifaa vya Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Inaonekana kwa zote zilizokaribu na vifaa vya Bluetooth"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Haionekani na vifaa vingine vyenye Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Inaonekana tu kwa vifaa vilivyolinganishwa"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Inakubali maombi ya kuoanisha ( <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> )"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Inakubali maombi ya kuoanisha"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Haikubali maombi ya kuoanisha"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Haikubali maombi ya kuoanisha"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Muda wa kuonekana"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Funga sauti ya upigaji simu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zuia matumizi yakibonyezi cha bluetooth wakati skrini imefungwa"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Tenganisha?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hii ikakata muunganisho wako na:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Inasambaza"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"Washa"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Zima"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wasifu ulemazwe?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Hii italemaza:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Kutoka:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Umeunganishwa"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Programu inataka kufanya simu yako ionekane kwenye vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Programu inataka kufanya kompyuta yako ndogo ionekane kwenye vifaa vingine vya Bluetooth. Unaweza kubadilisha hii baadaye kwenye mipangilio ya Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Programu inataka kufanya simu yako ionekane kwenye vifaa vingine vya Bluetooth. Unaweza kubadilisha hii baadaye kwenye mipangilio ya Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha usambazaji wa Bluetooth ili iwasiliane na vifaa vingine vilivyo karibu. Unaweza kubadilisha hii baadaye katika mipangilio ya Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha Bluetooth na usambazaji wa Bluetooth ili iwasiliane na vifaa vingine vilivyo karibu. Unaweza kubadilisha hii baadaye katika mipangilio ya Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kipengee hiki kinapowashwa, simu yako inaweza kuwasiliana na vifaa vingine vilivyo karibu.\n\n Usambazaji hutumia mawimbi ya Bluetooth ya nishati ndogo."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Programu inataka kuwasha Bluetooth na kufanya kompyuta yako ndogo ionekane kwa vifaa vingine kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Programu inataka kuwasha Bluetooth na kufanya simu yako ionekane kwa vifaa vingine kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Programu inataka kuwasha Bluetooth na kufanya kompyuta yako ndogo ionekane kwenye vifaa vingine. Unaweza kubadilisha hii baadaye kwenye mipangilio ya Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Programu inataka kuwasha Bluetooth na kufanya simu yako ionekane kwenye vifaa vingine. Unaweza kubadilisha hii baadaye kwenye mipangilio ya Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha usambazaji wa Bluetooth ili iwasiliane na vifaa vingine vilivyo karibu. Unaweza kubadilisha hii baadaye katika mipangilio ya Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"<xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha Bluetooth na usambazaji wa Bluetooth ili iwasiliane na vifaa vingine vilivyo karibu. Unaweza kubadilisha hii baadaye katika mipangilio ya Bluetooth."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kipengee hiki kinapowashwa, simu yako inaweza kuwasiliana na vifaa vingine vilivyo karibu.\n\n Usambazaji hutumia mawimbi ya Bluetooth ya nishati ndogo."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Inawasha Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Inazima Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Unganisha-kiotomatiki"</string>
@@ -1505,6 +1505,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Simu za sauti"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Kompyuta kibao haitumiki"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Wakati simu haitumiki"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Isiyorekodiwa"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Hesabu iliyopitiliza"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kwa jumla"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Mandharimbele ya CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Weka chonjo"</string>
@@ -1520,6 +1522,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Washa saa"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Muda bila mawimbi"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Uwezo jumla wa betri"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Nishati iliyokokotolewa"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Kiwango cha chini kabisa cha nishati halisi"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Kiwango cha juu kabisa cha nishati halisi"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Komesha kwa lazima"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Taarifa ya programu"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Mipangilio ya App"</string>
@@ -1543,6 +1549,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Chagua hali inayookoa betri"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Huenda programu ikatoa mipangilio ya kupunguza utumiaji wa betri"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Betri imetumiwa na mtumiaji"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Matumizi ya nishati yasiyokuwa na rekodi"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Hesabu ya matumizi ya nishati iliyopitiliza"</string>
+    <string name="mah" msgid="95245196971239711">"mAh <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> tangu ilipoondolewa"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ilipochopolewa mara ya mwisho kwa <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Jumla ya utumiaji"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 64cad5f..fd39d7b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"เย็น"</string>
     <string name="bluetooth" msgid="5549625000628014477">"บลูทูธ"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"อุปกรณ์บลูทูธใกล้เคียงทั้งหมดมองเห็นได้ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"อุปกรณ์บลูทูธใกล้เคียงทั้งหมดมองเห็นได้"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ไม่ให้อุปกรณ์บลูทูธอื่นเห็น"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"อุปกรณ์ที่จับคู่เท่านั้นที่มองเห็น"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"ระยะหมดเวลาการมองเห็น"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ล็อกการโทรด้วยเสียง"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ป้องกันการใช้โปรแกรมโทรออกผ่านบลูทูธเมื่อล็อกหน้าจอไว้"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ตัดการเชื่อมต่อหรือไม่"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"การดำเนินการนี้จะจบการเชื่อมต่อของคุณกับ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"การแพร่สัญญาณ"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ปิดใช้งานโปรไฟล์หรือไม่"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"การดำเนินการนี้จะปิดใช้งาน:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;จาก:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"เชื่อมต่อแล้ว"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นแท็บเล็ตของคุณได้ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ในภายหลังในการตั้งค่าบลูทูธ"</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นโทรศัพท์ของคุณได้ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ในภายหลังในการตั้งค่าบลูทูธ"</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการเปิดการแพร่สัญญาณบลูทูธเพื่อสื่อสารกับอุปกรณ์อื่นที่อยู่ใกล้ คุณสามารถเปลี่ยนการตั้งค่านี้ภายหลังได้ในการตั้งค่าบลูทูธ"</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการเปิดบลูทูธและการแพร่สัญญาณบลูทูธเพื่อสื่อสารกับอุปกรณ์อื่นที่อยู่ใกล้ คุณสามารถเปลี่ยนการตั้งค่านี้ภายหลังได้ในการตั้งค่าบลูทูธ"</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"เมื่อเปิดคุณลักษณะนี้ โทรศัพท์ของคุณจะสามารถสื่อสารกับอุปกรณ์อื่นๆ ที่อยู่ใกล้ได้\n\nการแพร่สัญญาณจะใช้สัญญาณบลูทูธที่ใช้พลังงานต่ำ"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"แอปพลิเคชันต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นสามารถมองเห็นแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"แอปพลิเคชันต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นสามารถมองเห็นโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"แอปพลิเคชันต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นสามารถมองเห็นแท็บเล็ตของคุณได้ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ในภายหลังในการตั้งค่าบลูทูธ"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"แอปพลิเคชันต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นสามารถมองเห็นโทรศัพท์ของคุณได้ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ในภายหลังในการตั้งค่าบลูทูธ"</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการเปิดการแพร่สัญญาณบลูทูธเพื่อสื่อสารกับอุปกรณ์อื่นที่อยู่ใกล้ คุณสามารถเปลี่ยนการตั้งค่านี้ภายหลังได้ในการตั้งค่าบลูทูธ"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"เมื่อเปิดคุณลักษณะนี้ โทรศัพท์ของคุณจะสามารถสื่อสารกับอุปกรณ์อื่นๆ ที่อยู่ใกล้ได้\n\nการแพร่สัญญาณจะใช้สัญญาณบลูทูธที่ใช้พลังงานต่ำ"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"กำลังเปิดบลูทูธ..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"กำลังปิดบลูทูธ…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"เชื่อมต่ออัตโนมัติ"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"การโทรด้วยเสียง"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ไม่มีการใช้งานแท็บเล็ต"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ไม่มีการใช้งานโทรศัพท์"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"ไม่สามารถคำนวณ"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"คำนวณมากเกินไป"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU รวม"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ส่วนหน้าของ CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ทำงานตลอดเวลา"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"วิดีโอ"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"เมื่อเวลา"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"ระยะเวลาที่ไม่มีสัญญาณ"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"ความจุแบตเตอรี่รวม"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"พลังงานที่คำนวณแล้ว"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"พลังงานจริงต่ำสุด"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"พลังงานจริงสูงสุด"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"บังคับให้หยุด"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"ข้อมูลแอปพลิเคชัน"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"การตั้งค่าแอปพลิเคชัน"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"เลือกโหมดประหยัดแบตเตอรี่"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"แอปพลิเคชันอาจเสนอการตั้งค่าที่ลดการใช้แบตเตอรี่"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"แบตเตอรี่ที่ใช้โดยผู้ใช้"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"การใช้พลังงานที่ไม่สามารถคำนวณ"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"การใช้พลังงานที่คำนวณมากเกินไป"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ตั้งแต่ถอดปลั๊ก"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"การใช้งานตั้งแต่ถอดปลั๊กของ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"ยอดใช้งานรวม"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 66f849f..d47db3e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Hindi kilalang error"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Malamig"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Makikita ng lahat ng mga kalapit na device ng Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Makikita ng lahat ng kalapit na mga Bluetooth na device"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Hindi makikita ng iba pang mga device ng Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Makikita lamang ng mga nakapares na device"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout ng visibility"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"I-lock ang pag-dial gamit ang boses"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Iwasan ang paggamit ng taga-dial ng bluetooth kapag naka-lock ang screen"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Idiskonekta?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tatapusin nito ang iyong koneksyon sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Pagbo-broadcast"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Huwag paganahin ang profile?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Hindi nito papaganahin ang:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Mula:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Konektado"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong telepono sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong tablet. Maaari mo itong palitan sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong telepono. Maaari mo itong palitan sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Gusto ng <xliff:g id="APP_NAME">%1$s</xliff:g> na i-on ang pagbo-broadcast ng Bluetooth upang makipag-ugnay sa iba pang mga device sa malapit. Mababago mo ito sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"Gusto ng <xliff:g id="APP_NAME">%1$s</xliff:g> na i-on ang Bluetooth at pagbo-broadcast ng Bluetooth upang makipag-ugnay sa iba pang mga device sa malapit. Mababago mo ito sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kapag naka-on ang feature na ito, maaaring makipag-ugnay ang iyong telepono sa iba pang mga device sa malapit.\n\nGumagamit ang pagbo-broadcast ng mga signal ng Bluetooth na mahina ang power."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Gustong i-on ng isang app ang Bluetooth at gawing nakikita ng iba pang mga device ang iyong tablet sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Gustong i-on ng isang app ang Bluetooth at gawing nakikita ng iba pang mga device ang iyong telepono sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Gustong i-on ng isang app ang Bluetooth at gawing nakikita ng iba pang mga device ang iyong tablet. Maaari mo itong palitan sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Gustong i-on ng isang app ang Bluetooth at gawing nakikita ng iba pang mga device ang iyong telepono. Maaari mo itong palitan sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Gusto ng <xliff:g id="APP_NAME">%1$s</xliff:g> na i-on ang pagbo-broadcast ng Bluetooth upang makipag-ugnay sa iba pang mga device sa malapit. Mababago mo ito sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Kapag naka-on ang feature na ito, maaaring makipag-ugnay ang iyong telepono sa iba pang mga device sa malapit.\n\nGumagamit ang pagbo-broadcast ng mga signal ng Bluetooth na mahina ang power."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Binubuksan ang Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"I-no-off ang Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Mga boses ng tawag"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Idle ang tablet"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Idle ang telepono"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Hindi nakalkula"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Sobrang nakalkula"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Kabuuan ng CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Panatilihing bukas"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Naka-on ang oras"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Oras na walang signal"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Kabuuang kakayahan ng baterya"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Nakalkulang power"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Min na aktwal na power"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Max na aktwal na power"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Sapilitang pagtigil"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Impormasyon ng app"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Mga setting ng app"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Piliin ang battery-saving mode"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Maaaring mag-alok ang app ng mga setting upang mabawasan ang paggamit ng baterya"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateryang ginamit ng user"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Hindi nakalkulang paggamit ng power"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sobrang nakalkulang paggamit ng power"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> (na) mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> mula nang na-unplug"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Habang huling naka-unplug para sa <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Mga kabuuan ng paggamit"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index bcddcc5..a43b93c 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Bilinmeyen hata"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Soğuk"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Ykndki tüm Bluetooth chzlr trfndan görlblir (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Yakındki tüm Bluetooth cihazlrı trfndan görüleblir"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Diğer Bluetooth cihazları tarafından görülemez"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Sadece eşleştirilmiş chzlar tarafından görülebilir"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Görünürlük zaman aşımı"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sesli aramayı kilitle"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Ekran kilitliyken blutooth çeviricinin kullanımını engelle"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Bağlantı kesilsin mi?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Şu cihazla bağlantınız kesilecek:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Yayınlama"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil devre dışı bırakılsın mı?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Şu devre dışı bırakılacak:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Şu cihazdan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Bağlandı"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Bir uygulama, telefonunuzu <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazlarına görünebilir yapmak istiyor."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Bir uygulama tabletinizi diğer Bluetooth cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Bir uygulama telefonunuzu diğer Bluetooth cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>, yakındaki diğer cihazlarla iletişim kurmak için Bluetooth yayınını açmak istiyor. Bunu daha sonra Bluetooth ayarlarında değiştirebilirsiniz."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g>, yakındaki diğer cihazlarla iletişim kurmak için Bluetooth\'u ve Bluetooth yayınını açmak istiyor. Bunu daha sonra Bluetooth ayarlarında değiştirebilirsiniz."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Bu özellik açık olduğunda, telefonunuz yakındaki diğer cihazlarla iletişim kurabilir.\n\nYayınlama sırasında düşük güçlü Bluetooth sinyalleri kullanılır."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Bir uygulama Bluetooth\'u açmak ve <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca tabletinizi diğer cihazlara görünebilir yapmak istiyor."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Bir uygulama Bluetooth\'u açmak ve <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca telefonunuzu diğer cihazlara görünebilir yapmak istiyor."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Bir uygulama Bluetooth\'u açmak ve tabletinizi diğer cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Bir uygulama Bluetooth\'u açmak ve telefonunuzu diğer cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g>, yakındaki diğer cihazlarla iletişim kurmak için Bluetooth yayınını açmak istiyor. Bunu daha sonra Bluetooth ayarlarında değiştirebilirsiniz."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Bu özellik açık olduğunda, telefonunuz yakındaki diğer cihazlarla iletişim kurabilir.\n\nYayınlama sırasında düşük güçlü Bluetooth sinyalleri kullanılır."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth açılıyor..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth kapatılıyor..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Otomatik bağlan"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Sesli aramalar"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet boşta"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon boşta"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Yetersiz hesaplandı"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Fazla hesaplandı"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Toplam CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ön planı"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Uyanık tut"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Açma zamanı"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Kapsama alanı dışındaki zaman"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Toplam pil kapasitesi"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Hesaplanan güç"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Min. gerçek güç"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Maks. gerçek güç"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Durmaya zorla"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Uygulama bilgileri"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Uygulama ayarları"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pil tasarrufu modunu seçin"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Uygulama, pil kullanımını azaltmak için ayarlar önerebilir"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Kullanıcı tarafından harcanan pil miktarı"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Hesaplanmayan güç kullanımı"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Fazla hesaplanan güç kullanımı"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Fişten çekildikten itibaren <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> için fişten son çekildikten itibaren"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Kullanım toplamı"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3474ea8..3c4bcdc 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Невідома помилка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Низька"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видимий для всіх пристроїв Bluetooth неподалік (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видимий для всіх пристроїв Bluetooth неподалік"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Невидимий для інших пристроїв Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видимий лише для спарених пристроїв"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"Приймання запитів на створення пари (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"Приймання запитів на створення пари"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"Неприймання запитів на створення пари"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"Неприймання запитів на створення пари"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Час видимості"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заблок. голос. набір"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Запобігає використанню набору bluetooth, коли екран заблоковано"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Від’єднатися?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Це призведе до роз’єднання з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Трансляція"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"Увімк."</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"Вимк."</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Вимкнути профіль?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Це вимкне профіль: &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;З пристрою:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Підключено"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Програма хоче зробити ваш телефон видимим для інших пристроїв Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Програма хоче зробити ваш планшетний ПК видимим для інших пристроїв Bluetooth. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Програма хоче зробити ваш телефон видимим для інших пристроїв Bluetooth. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Програма <xliff:g id="APP_NAME">%1$s</xliff:g> хоче ввімкнути трансляцію через Bluetooth, щоб обмінюватися даними з розташованими поблизу пристроями. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"Програма <xliff:g id="APP_NAME">%1$s</xliff:g> хоче ввімкнути Bluetooth і трансляцію через Bluetooth, щоб обмінюватися даними з розташованими поблизу пристроями. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Якщо цю функцію ввімкнено, ваш телефон може обмінюватися даними з розташованими поблизу пристроями.\n\nПід час трансляції використовуються сигнали Bluetooth низької потужності."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Програма хоче ввімкнути Bluetooth і зробити ваш планшетний ПК видимим для інших пристроїв упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Програма хоче ввімкнути Bluetooth і зробити ваш телефон видимим для інших пристроїв упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Програма хоче ввімкнути Bluetooth і зробити ваш планшетний ПК видимим для інших пристроїв. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Програма хоче ввімкнути Bluetooth і зробити ваш телефон видимим для інших пристроїв. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"Програма <xliff:g id="APP_NAME">%1$s</xliff:g> хоче ввімкнути трансляцію через Bluetooth, щоб обмінюватися даними з розташованими поблизу пристроями. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"Програма <xliff:g id="APP_NAME">%1$s</xliff:g> хоче ввімкнути Bluetooth і трансляцію через Bluetooth, щоб обмінюватися даними з розташованими поблизу пристроями. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Якщо цю функцію ввімкнено, ваш телефон може обмінюватися даними з розташованими поблизу пристроями.\n\nПід час трансляції використовуються сигнали Bluetooth низької потужності."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Увімкнення Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Вимкнення Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Автоматичне з’єднання"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Голос. дзвінки"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Режим очікув."</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Режим очік."</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Невраховане"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Переоцінене"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Заг. ЦП"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Актив. процеси ЦП"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Залишати активним"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Відео"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Час роботи"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Час без сигналу"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Загальна ємність акумулятора"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Обчислене енергоспоживання"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Мінімальне енергоспоживання"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Максимальне енергоспоживання"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Примус.припин."</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Інформація про програму"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Налаштування програми"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Виберіть режим економії заряду акумулятора"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"У програмі можуть бути налаштування режиму енергозбереження"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Використання акумулятора користувачем"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Невраховане енергоспоживання"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Переоцінене енергоспоживання"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА/год"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> з часу відключ."</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"З часу ост. відключ. для <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Заг. використ."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5ebca92..92747d9 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Lỗi không xác định"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Không hoạt động"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Hiển thị với tất cả th.bị Bluetooth gần đó (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Hiển thị với tất cả các thiết bị Bluetooth gần đó"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Không hiển thị với các thiết bị Bluetooth khác"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Chỉ hiển thị với các thiết bị được ghép nối"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Hết thời gian hiển thị"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Khoá quay số bằng giọng nói"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Ngăn việc sử dụng trình quay số bluetooth khi màn hình bị khóa."</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ngắt kết nối?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tác vụ này sẽ kết thúc kết nối của bạn với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Phát sóng"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vô hiệu hồ sơ?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Điều này sẽ vô hiệu:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Khỏi:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Đã kết nối"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Một ứng dụng muốn đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Một ứng dụng muốn đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Một ứng dụng muốn đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> muốn bật phát sóng Bluetooth để giao tiếp với các thiết bị lân cận khác. Bạn có thể thay đổi thiết lập này sau trong cài đặt Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> muốn bật Bluetooth và phát sóng Bluetooth để giao tiếp với các thiết bị lân cận khác. Bạn có thể thay đổi thiết lập này sau trong cài đặt Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Khi tính năng này được bật, điện thoại của bạn có thể giao tiếp với các thiết bị lân cận khác.\n\nPhát sóng sử dụng tín hiệu Bluetooth điện năng thấp."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Một ứng dụng muốn bật Bluetooth và đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Một ứng dụng muốn bật Bluetooth và đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Một ứng dụng muốn bật Bluetooth và đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Một ứng dụng muốn bật Bluetooth và đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> muốn bật phát sóng Bluetooth để giao tiếp với các thiết bị lân cận khác. Bạn có thể thay đổi thiết lập này sau trong cài đặt Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Khi tính năng này được bật, điện thoại của bạn có thể giao tiếp với các thiết bị lân cận khác.\n\nPhát sóng sử dụng tín hiệu Bluetooth điện năng thấp."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Đang bật Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Đang tắt Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Tự động kết nối"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Cuộc gọi thoại"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Máy tính bảng ở chế độ rảnh"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Điện thoại ở chế độ rảnh"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Dưới mức"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Vượt mức"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU tổng"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Nền trước CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Không khóa màn hình"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Thời gian bật"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Thời gian không có tín hiệu"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Tổng công suất pin"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Nguồn đã tính"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Nguồn tối thiểu thực tế"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Nguồn tối đa thực tế"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Buộc dừng"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Thông tin về ứng dụng"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Cài đặt ứng dụng"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Chọn chế độ tiết kiệm pin"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Ứng dụng có thể cung cấp các cài đặt để giảm mức sử dụng pin"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Pin do người dùng sử dụng"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Sử dụng nguồn dưới mức"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sử dụng nguồn vượt mức"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> từ khi tháo đầu cắm"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Trong khi tháo đầu cắm lần cuối cho <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Tổng số sử dụng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d4dbb6d..a6ff484 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"未知错误"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"电量低"</string>
     <string name="bluetooth" msgid="5549625000628014477">"蓝牙"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"附近所有蓝牙设备均可检测到此设备（<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>）"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"附近所有蓝牙设备均可检测到此设备"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"其他蓝牙设备检测不到此设备"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"已配对的设备可检测到此设备"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"检测超时设置"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"锁定语音拨号"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"屏幕锁定时停止使用蓝牙拨号器"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"断开连接？"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"此操作将会断开您与以下设备的连接：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"广播"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"要停用配置文件吗？"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"此操作将停用：&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;来自：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"已连接"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内可检测到您的手机。"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"某个应用想让其他蓝牙设备检测到您的平板电脑。之后，您可以在“蓝牙”设置中更改此设置。"</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"某个应用想让其他蓝牙设备检测到您的手机。之后，您可以在“蓝牙”设置中更改此设置。"</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"“<xliff:g id="APP_NAME">%1$s</xliff:g>”请求开启蓝牙广播功能，以便与附近的其他设备通信。稍后您可以在“蓝牙”设置中更改此设置。"</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"“<xliff:g id="APP_NAME">%1$s</xliff:g>”请求开启蓝牙和蓝牙广播功能，以便与附近的其他设备通信。稍后您可以在“蓝牙”设置中更改此设置。"</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"开启此功能后，您的手机就可以与附近的其他设备通信。\n\n广播功能会使用低电耗的蓝牙信号。"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"某个应用想要打开蓝牙，以便其他设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内可检测到您的平板电脑。"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"某个应用想要打开蓝牙，以便其他设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内可检测到您的手机。"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"某个应用想要打开蓝牙，以便其他设备可检测到您的平板电脑。之后，您可以在“蓝牙”设置中更改此设置。"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"某个应用想要打开蓝牙，以便其他设备可检测到您的手机。之后，您可以在“蓝牙”设置中更改此设置。"</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"“<xliff:g id="APP_NAME">%1$s</xliff:g>”请求开启蓝牙广播功能，以便与附近的其他设备通信。稍后您可以在“蓝牙”设置中更改此设置。"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"开启此功能后，您的手机就可以与附近的其他设备通信。\n\n广播功能会使用低电耗的蓝牙信号。"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"正在打开蓝牙..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"正在关闭蓝牙…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"自动连接"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"语音通话"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"平板电脑待机"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"手机待机"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"未计算在内的"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"多算了的"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 总使用时间"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU（前台）"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持唤醒状态"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"视频"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"已运行时间"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"无信号的时间"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"电池总容量"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"计算出的用电量"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"最低实际用电量"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"最高实际用电量"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"强行停止"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"应用信息"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"应用设置"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"选择“耗电量低”模式"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"该应用中可能提供了用于减少耗电量的设置"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"用户所耗电量"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"未计算在内的用电量"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"多算了的用电量"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>毫安时"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔下电源后已过 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"上次拔下电源 <xliff:g id="UNPLUGGED">%1$s</xliff:g> 时"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"总使用量"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index db1a5dd..58cecf9 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"未知錯誤"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"冷"</string>
     <string name="bluetooth" msgid="5549625000628014477">"藍牙"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"向附近所有藍牙裝置顯示 (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"向附近所有藍牙裝置顯示"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"不向其他藍牙裝置顯示"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"只向配對的裝置顯示"</string>
+    <string name="bluetooth_is_discoverable" msgid="3437013735920768864">"正在接受配對要求 (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6790327581899350931">"正在接受配對要求"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="3712158328437385188">"不接受配對要求"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="5700531401823649038">"不接受配對要求"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"顯示時限"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"鎖定語音撥號"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"螢幕鎖定時不要使用藍牙撥號"</string>
@@ -129,6 +129,8 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"中斷連線？"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"這樣會結束您與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"廣播"</string>
+    <string name="bluetooth_broadcasting_state_on" msgid="7018225104637987233">"開啟"</string>
+    <string name="bluetooth_broadcasting_state_off" msgid="2448855139691027345">"關閉"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"停用個人資料？"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"這會停用：&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;來源：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"已連結"</string>
@@ -155,13 +157,11 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"應用程式要求將手機設為向其他藍牙裝置顯示，顯示的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"應用程式要求將平板電腦設為向其他裝置顯示。您稍後可在 [藍牙] 設定中更改這項設定。"</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"應用程式要求將手機設為向其他裝置顯示。您稍後可在 [藍牙] 設定中更改這項設定。"</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求開啟藍牙廣播功能，這是為了連接附近的其他裝置。您之後可以在「藍牙」設定中變更這項設定。"</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求開啟藍牙和藍牙廣播功能，這是為了連接附近的其他裝置。您之後可以在「藍牙」設定中變更這項設定。"</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"開啟這項功能後，您的手機便可與附近的其他裝置連接。\n\n廣播功能會使用低耗電量的藍牙訊號。"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"應用程式要求開啟藍牙功能 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，在這段時間內將平板電腦設為向其他裝置顯示。"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"應用程式要求開啟藍牙功能 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，在這段時間內將手機設為向其他裝置顯示。"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"應用程式要求開啟藍牙功能，將平板電腦設為向其他裝置顯示。您稍後可在 [藍牙] 設定中更改這項設定。"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"應用程式要求開啟藍牙功能，將手機設為向其他裝置顯示。您稍後可在 [藍牙] 設定中更改這項設定。"</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求開啟藍牙廣播功能，這是為了連接附近的其他裝置。您之後可以在「藍牙」設定中變更這項設定。"</string>
+    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="1783727814076135171">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求開啟藍牙和藍牙廣播功能，這是為了連接附近的其他裝置。您之後可以在「藍牙」設定中變更這項設定。"</string>
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"開啟這項功能後，您的手機便可與附近的其他裝置連接。\n\n廣播功能會使用低耗電量的藍牙訊號。"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"藍牙開啟中…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"關閉藍牙？？？"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"自動連線"</string>
@@ -1511,6 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"語音通話"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"平板電腦閒置"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"用途不明"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"計算過高"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前端使用狀況"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持啟用"</string>
@@ -1526,6 +1528,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"影片"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"開啟時間"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"無訊號的時間"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"總電池容量"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"經計算的用電量"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"最小實際用電量"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"最大實際用電量"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"強制停止"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"應用程式資訊"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"應用程式設定"</string>
@@ -1549,6 +1555,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"選取節約電池用量模式"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"應用程式可能有提供節省電力的設定"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"用戶用電量"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"用途不明的用電量"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"計算過高的用電量"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔除插頭後已耗電 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> 前拔除電源"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"整體使用狀況"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a755c57..11bcbbb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"未知的錯誤"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"冷"</string>
     <string name="bluetooth" msgid="5549625000628014477">"藍牙"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"向附近所有藍牙裝置顯示 (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"向附近所有藍牙裝置顯示"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"不向其他藍牙裝置顯示"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"只向配對的裝置顯示"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"偵測時限設定"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"鎖定語音撥號"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"螢幕鎖定時不要使用藍牙撥號"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"中斷連線？"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"這樣會結束您與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"廣播"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"停用設定檔？"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"這會停用以下設定檔：&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;來源：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"已連線"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"應用程式要求開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，讓其他藍牙裝置能搜尋到您的手機。"</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"應用程式要求讓其他藍芽裝置能搜尋到您的平版電腦。您日後可在 [藍牙] 設定中變更這項設定。"</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"應用程式要求讓其他藍芽裝置能搜尋到您的手機。您日後可在 [藍牙] 設定中變更這項設定。"</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟藍牙廣播功能，以便與附近的其他裝置連線。如果需要，您隨時可在 [藍牙設定] 中變更這項設定。"</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟藍牙和藍牙廣播功能，以便與附近的其他裝置連線。如果需要，您隨時可在 [藍牙設定] 中變更這項設定。"</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"開啟這項功能時，您的手機可與附近的其他裝置連線。\n\n廣播功能會使用低耗電的藍牙訊號。"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"應用程式要求開啟藍牙功能 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，讓其他裝置能搜尋到您的平板電腦。"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"應用程式要求開啟藍牙功能 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，讓其他裝置能搜尋到您的手機。"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"應用程式要求開啟藍牙功能，讓其他裝置能搜尋到您的平板電腦。您日後可在 [藍牙] 設定中變更這項設定。"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"應用程式要求開啟藍牙功能，讓其他裝置能搜尋到您的手機。您日後可在 [藍牙] 設定中變更這項設定。"</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟藍牙廣播功能，以便與附近的其他裝置連線。如果需要，您隨時可在 [藍牙設定] 中變更這項設定。"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"開啟這項功能時，您的手機可與附近的其他裝置連線。\n\n廣播功能會使用低耗電的藍牙訊號。"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"藍牙開啟中…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"正在關閉藍牙…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"自動連線"</string>
@@ -1511,6 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"語音通話"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"平板電腦閒置"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"用途不明"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"估計過高"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前端使用狀況"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"停用休眠"</string>
@@ -1526,6 +1535,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"影片"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"開啟時間"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"無訊號的時間"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"總電池容量"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"經過計算的用電量"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"最小實際用電量"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"最大實際用電量"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"強制停止"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"應用程式資訊"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"應用程式設定"</string>
@@ -1549,6 +1562,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"選取節約耗電量模式"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"應用程式可能會提供省電的設定"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"使用者用電量"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"用途不明的用電量"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"估計過高的用電量"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔除插頭後已過了 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> 前拔除插頭"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"電池整體使用狀況"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 7e8f00e..6dc2fe7 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -110,10 +110,14 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Iphutha elingaziwa"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kuyabanda"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Ibonakala kuwo wonke amadivayisi e-Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Iyabonakala kuwo wonke amadivaysi aseduze we-Bluetooth"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ayibonakali kwamanye amadivayisi e-Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Ibonakala kuphela kumadivayisi apheyiwe"</string>
+    <!-- no translation found for bluetooth_is_discoverable (3437013735920768864) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (6790327581899350931) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (3712158328437385188) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (5700531401823649038) -->
+    <skip />
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Isikhathi sokubonakala"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Vala ukudayela ngezwi"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Gwema ukusebenzisa isidayeli se-bluetooth lapho isikrini sivaliwe"</string>
@@ -129,6 +133,10 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ungaxhumeki kwi-inthanethi?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Lokhu kuzophelisa uxhumano nge:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Ukusakaza"</string>
+    <!-- no translation found for bluetooth_broadcasting_state_on (7018225104637987233) -->
+    <skip />
+    <!-- no translation found for bluetooth_broadcasting_state_off (2448855139691027345) -->
+    <skip />
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vimbela iphrofayli?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Lokhu kuzovimbela:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Kusukalt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ixhunyiwe"</string>
@@ -155,13 +163,12 @@
     <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Uhlelo lokusebenza oluthile lufuna ukwenza ifoni yakho ibonakale kwamanye amadivayisi we-Bluetooth kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ithebulethi yakho ibonakale kwamanye amadivayisi we-Bluetooth. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ifoni yakho ibonakale kwamanye amadivayisi we-Bluetooth. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
-    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> ifuna ukuvula ukusakaza nge-Bluetooth ukuze ixhumane namanye amadivayisi aseduze. Ungakwazi ukushintsha lokhu ngemva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> ifuna ukuvula i-Bluetooth nokusakaza nge-Bluetooth ukuze ixhumane namanye amadivayisi aseduze. Ungakwazi ukushintsha lokhu ngemva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
-    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Lapho lesi sici sivuliwe, ifoni yakho ingakwazi ukuxhumana namanye amadivayisi aseduze.\n\nUkusakaza kusebenzisa amasignali we-Bluetooth amandla aphansi."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ithebulethi yakho ibonakale kwamanye amadivayisi kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ifoni yakho ibonakale kwamanye amadivayisi kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ithebulethi yakho ibonakale kwamanye amadivayisi. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ifoni yakho ibonakale kwamanye amadivayisi. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
+    <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"<xliff:g id="APP_NAME">%1$s</xliff:g> ifuna ukuvula ukusakaza nge-Bluetooth ukuze ixhumane namanye amadivayisi aseduze. Ungakwazi ukushintsha lokhu ngemva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_start_broadcast (1783727814076135171) -->
+    <skip />
+    <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"Lapho lesi sici sivuliwe, ifoni yakho ingakwazi ukuxhumana namanye amadivayisi aseduze.\n\nUkusakaza kusebenzisa amasignali we-Bluetooth amandla aphansi."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Ivula i-Bluetooth"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Ivala i-Bluetooth"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Ukuxhuma okuzenzakalelayo"</string>
@@ -1518,6 +1525,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Amakholi ezwi"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Ithebhulethi ayenzi lutho"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Ifoni ayenzi lutho"</string>
+    <string name="power_unaccounted" msgid="4835429811853042257">"Okungabaliwe"</string>
+    <string name="power_overcounted" msgid="2762354976171358445">"Okubalwe ngaphezulu"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Inani le-CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ingaphambili le-CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Gcina kuphapheme"</string>
@@ -1533,6 +1542,10 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Ividiyo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Isikhathi sivuliwe"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Isikhathi esingena siginali"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Amandla aphelele webhetri"</string>
+    <string name="usage_type_computed_power" msgid="3665248793473498804">"Amandla wekhompyutha"</string>
+    <string name="usage_type_min_actual_power" msgid="4772874833688090017">"Ubuncane bamandla wangempela"</string>
+    <string name="usage_type_max_actual_power" msgid="429012562553903697">"Ubuningi bamandla wangempela"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Phoqelela ukuma"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Ulwazi lohlelo lokusebenza"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Izilungiselelo zohlelo lokusebenza"</string>
@@ -1556,6 +1569,9 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Khetha imodi yokulondoloza ibhethri"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Uhlelo lokusebenza lunganikeza izilungiselelo ukwehlisa ukusebenzisa ibhetri"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Ibhethri elisetshenziswe umsebenzisi"</string>
+    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Ukusetshenziswa kwamandla okungabalwa"</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ukusetshenziswa kwamandla okubalwe ngaphezulu"</string>
+    <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> kusukelwa kungaxhunyiwe"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ngenkathi igcinwe ukunqamulwa kwe <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Inani lokusetshenziswa"</string>
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 2e31318..91f7fbc0 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -25,7 +25,6 @@
 import android.app.DialogFragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -722,12 +721,12 @@
         private DevicePolicyManager mDevicePolicyManager;
 
         private static class HeaderViewHolder {
-            ImageView icon;
-            TextView title;
-            TextView summary;
-            Switch switch_;
-            ImageButton button;
-            View divider;
+            ImageView mIcon;
+            TextView mTitle;
+            TextView mSummary;
+            Switch mSwitch;
+            ImageButton mButton;
+            View mDivider;
         }
 
         private LayoutInflater mInflater;
@@ -797,40 +796,40 @@
                     case HEADER_TYPE_CATEGORY:
                         view = new TextView(getContext(), null,
                                 android.R.attr.listSeparatorTextViewStyle);
-                        holder.title = (TextView) view;
+                        holder.mTitle = (TextView) view;
                         break;
 
                     case HEADER_TYPE_SWITCH:
                         view = mInflater.inflate(R.layout.preference_header_switch_item, parent,
                                 false);
-                        holder.icon = (ImageView) view.findViewById(R.id.icon);
-                        holder.title = (TextView)
+                        holder.mIcon = (ImageView) view.findViewById(R.id.icon);
+                        holder.mTitle = (TextView)
                                 view.findViewById(com.android.internal.R.id.title);
-                        holder.summary = (TextView)
+                        holder.mSummary = (TextView)
                                 view.findViewById(com.android.internal.R.id.summary);
-                        holder.switch_ = (Switch) view.findViewById(R.id.switchWidget);
+                        holder.mSwitch = (Switch) view.findViewById(R.id.switchWidget);
                         break;
 
                     case HEADER_TYPE_BUTTON:
                         view = mInflater.inflate(R.layout.preference_header_button_item, parent,
                                 false);
-                        holder.icon = (ImageView) view.findViewById(R.id.icon);
-                        holder.title = (TextView)
+                        holder.mIcon = (ImageView) view.findViewById(R.id.icon);
+                        holder.mTitle = (TextView)
                                 view.findViewById(com.android.internal.R.id.title);
-                        holder.summary = (TextView)
+                        holder.mSummary = (TextView)
                                 view.findViewById(com.android.internal.R.id.summary);
-                        holder.button = (ImageButton) view.findViewById(R.id.buttonWidget);
-                        holder.divider = view.findViewById(R.id.divider);
+                        holder.mButton = (ImageButton) view.findViewById(R.id.buttonWidget);
+                        holder.mDivider = view.findViewById(R.id.divider);
                         break;
 
                     case HEADER_TYPE_NORMAL:
                         view = mInflater.inflate(
                                 R.layout.preference_header_item, parent,
                                 false);
-                        holder.icon = (ImageView) view.findViewById(R.id.icon);
-                        holder.title = (TextView)
+                        holder.mIcon = (ImageView) view.findViewById(R.id.icon);
+                        holder.mTitle = (TextView)
                                 view.findViewById(com.android.internal.R.id.title);
-                        holder.summary = (TextView)
+                        holder.mSummary = (TextView)
                                 view.findViewById(com.android.internal.R.id.summary);
                         break;
                 }
@@ -843,15 +842,15 @@
             // All view fields must be updated every time, because the view may be recycled
             switch (headerType) {
                 case HEADER_TYPE_CATEGORY:
-                    holder.title.setText(header.getTitle(getContext().getResources()));
+                    holder.mTitle.setText(header.getTitle(getContext().getResources()));
                     break;
 
                 case HEADER_TYPE_SWITCH:
                     // Would need a different treatment if the main menu had more switches
                     if (header.id == R.id.wifi_settings) {
-                        mWifiEnabler.setSwitch(holder.switch_);
+                        mWifiEnabler.setSwitch(holder.mSwitch);
                     } else {
-                        mBluetoothEnabler.setSwitch(holder.switch_);
+                        mBluetoothEnabler.setSwitch(holder.mSwitch);
                     }
                     updateCommonHeaderView(header, holder);
                     break;
@@ -860,16 +859,16 @@
                     if (header.id == R.id.security_settings) {
                         boolean hasCert = DevicePolicyManager.hasAnyCaCertsInstalled();
                         if (hasCert) {
-                            holder.button.setVisibility(View.VISIBLE);
-                            holder.divider.setVisibility(View.VISIBLE);
+                            holder.mButton.setVisibility(View.VISIBLE);
+                            holder.mDivider.setVisibility(View.VISIBLE);
                             boolean isManaged = mDevicePolicyManager.getDeviceOwner() != null;
                             if (isManaged) {
-                                holder.button.setImageResource(R.drawable.ic_settings_about);
+                                holder.mButton.setImageResource(R.drawable.ic_settings_about);
                             } else {
-                                holder.button.setImageResource(
+                                holder.mButton.setImageResource(
                                         android.R.drawable.stat_notify_error);
                             }
-                            holder.button.setOnClickListener(new OnClickListener() {
+                            holder.mButton.setOnClickListener(new OnClickListener() {
                                 @Override
                                 public void onClick(View v) {
                                     Intent intent = new Intent(
@@ -878,8 +877,8 @@
                                 }
                             });
                         } else {
-                            holder.button.setVisibility(View.GONE);
-                            holder.divider.setVisibility(View.GONE);
+                            holder.mButton.setVisibility(View.GONE);
+                            holder.mDivider.setVisibility(View.GONE);
                         }
                     }
                     updateCommonHeaderView(header, holder);
@@ -901,25 +900,25 @@
                     Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType);
                     setHeaderIcon(holder, icon);
                 } else {
-                    holder.icon.setImageResource(header.iconRes);
+                    holder.mIcon.setImageResource(header.iconRes);
                 }
-                holder.title.setText(header.getTitle(getContext().getResources()));
+                holder.mTitle.setText(header.getTitle(getContext().getResources()));
                 CharSequence summary = header.getSummary(getContext().getResources());
                 if (!TextUtils.isEmpty(summary)) {
-                    holder.summary.setVisibility(View.VISIBLE);
-                    holder.summary.setText(summary);
+                    holder.mSummary.setVisibility(View.VISIBLE);
+                    holder.mSummary.setText(summary);
                 } else {
-                    holder.summary.setVisibility(View.GONE);
+                    holder.mSummary.setVisibility(View.GONE);
                 }
             }
 
         private void setHeaderIcon(HeaderViewHolder holder, Drawable icon) {
-            ViewGroup.LayoutParams lp = holder.icon.getLayoutParams();
+            ViewGroup.LayoutParams lp = holder.mIcon.getLayoutParams();
             lp.width = getContext().getResources().getDimensionPixelSize(
                     R.dimen.header_icon_width);
             lp.height = lp.width;
-            holder.icon.setLayoutParams(lp);
-            holder.icon.setImageDrawable(icon);
+            holder.mIcon.setLayoutParams(lp);
+            holder.mIcon.setImageDrawable(icon);
         }
 
         public void resume() {
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index cdb96cb..65d0934 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -35,15 +35,20 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.ProgressBar;
+import android.widget.Spinner;
 import android.widget.TabHost;
 import android.widget.TextView;
 import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -360,10 +365,42 @@
     }
 
     private void showCertDialog(final CertHolder certHolder) {
-        View view = certHolder.mSslCert.inflateCertificateView(getActivity());
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setTitle(com.android.internal.R.string.ssl_certificate);
-        builder.setView(view);
+
+        final ArrayList<View> views =  new ArrayList<View>();
+        final ArrayList<String> titles = new ArrayList<String>();
+        addCertChain(certHolder, views, titles);
+
+        ArrayAdapter<String> arrayAdapter = new ArrayAdapter<String>(getActivity(),
+                android.R.layout.simple_spinner_item,
+                titles);
+        arrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        Spinner spinner = new Spinner(getActivity());
+        spinner.setAdapter(arrayAdapter);
+        spinner.setOnItemSelectedListener(new OnItemSelectedListener() {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int position,
+                        long id) {
+                    for(int i = 0; i < views.size(); i++) {
+                        views.get(i).setVisibility(i == position ? View.VISIBLE : View.GONE);
+                    }
+                }
+               @Override
+               public void onNothingSelected(AdapterView<?> parent) { }
+            });
+
+        LinearLayout container = new LinearLayout(getActivity());
+        container.setOrientation(LinearLayout.VERTICAL);
+        container.addView(spinner);
+        for (int i = 0; i < views.size(); ++i) {
+            View certificateView = views.get(i);
+            if (i != 0) {
+                certificateView.setVisibility(View.GONE);
+            }
+            container.addView(certificateView);
+        }
+        builder.setView(container);
         builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
             @Override public void onClick(DialogInterface dialog, int id) {
                 dialog.dismiss();
@@ -371,6 +408,7 @@
         });
         final Dialog certDialog = builder.create();
 
+        View view = views.get(0);
         ViewGroup body = (ViewGroup) view.findViewById(com.android.internal.R.id.body);
         LayoutInflater inflater = LayoutInflater.from(getActivity());
         Button removeButton = (Button) inflater.inflate(R.layout.trusted_credential_details,
@@ -409,6 +447,27 @@
         certDialog.show();
     }
 
+    private void addCertChain(final CertHolder certHolder, final ArrayList<View> views,
+            final ArrayList<String> titles) {
+
+        List<X509Certificate> certificates = null;
+        try {
+            certificates = mStore.getCertificateChain(certHolder.mX509Cert);
+        } catch (CertificateException ex) {
+            return;
+        }
+        for (X509Certificate certificate : certificates) {
+            addCertDetails(certificate, views, titles);
+        }
+    }
+
+    private void addCertDetails(X509Certificate certificate, final ArrayList<View> views,
+            final ArrayList<String> titles) {
+        SslCertificate sslCert = new SslCertificate(certificate);
+        views.add(sslCert.inflateCertificateView(getActivity()));
+        titles.add(sslCert.getIssuedTo().getCName());
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == REQUEST_PIN_CHALLENGE) {
diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java
new file mode 100644
index 0000000..4d1fb2f
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryEntry.java
@@ -0,0 +1,305 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.graphics.drawable.Drawable;
+import android.os.BatteryStats;
+import android.os.Handler;
+import android.os.UserManager;
+import com.android.internal.os.BatterySipper;
+import com.android.settings.R;
+import com.android.settings.users.UserUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * Wraps the power usage data of a BatterySipper with information about package name
+ * and icon image.
+ */
+public class BatteryEntry {
+    public static final int MSG_UPDATE_NAME_ICON = 1;
+    public static final int MSG_REPORT_FULLY_DRAWN = 2;
+
+    static final HashMap<String,UidToDetail> sUidCache = new HashMap<String,UidToDetail>();
+
+    static final ArrayList<BatteryEntry> mRequestQueue = new ArrayList<BatteryEntry>();
+    static Handler mHandler;
+
+    static private class NameAndIconLoader extends Thread {
+        private boolean mAbort = false;
+
+        public NameAndIconLoader() {
+            super("BatteryUsage Icon Loader");
+        }
+
+        public void abort() {
+            mAbort = true;
+        }
+
+        @Override
+        public void run() {
+            while (true) {
+                BatteryEntry be;
+                synchronized (mRequestQueue) {
+                    if (mRequestQueue.isEmpty() || mAbort) {
+                        mHandler.sendEmptyMessage(MSG_REPORT_FULLY_DRAWN);
+                        mRequestQueue.clear();
+                        return;
+                    }
+                    be = mRequestQueue.remove(0);
+                }
+                be.loadNameAndIcon();
+            }
+        }
+    }
+
+    private static NameAndIconLoader mRequestThread;
+
+    public static void startRequestQueue() {
+        if (mHandler != null) {
+            synchronized (mRequestQueue) {
+                if (!mRequestQueue.isEmpty()) {
+                    if (mRequestThread != null) {
+                        mRequestThread.abort();
+                    }
+                    mRequestThread = new NameAndIconLoader();
+                    mRequestThread.setPriority(Thread.MIN_PRIORITY);
+                    mRequestThread.start();
+                    mRequestQueue.notify();
+                }
+            }
+        }
+    }
+
+    public static void stopRequestQueue() {
+        synchronized (mRequestQueue) {
+            if (mRequestThread != null) {
+                mRequestThread.abort();
+                mRequestThread = null;
+                mHandler = null;
+            }
+        }
+    }
+
+    public static void clearUidCache() {
+        sUidCache.clear();
+    }
+
+    public final Context context;
+    public final BatterySipper sipper;
+
+    public String name;
+    public Drawable icon;
+    public int iconId; // For passing to the detail screen.
+    public String defaultPackageName;
+
+    static class UidToDetail {
+        String name;
+        String packageName;
+        Drawable icon;
+    }
+
+    public BatteryEntry(Context context, Handler handler, UserManager um, BatterySipper sipper) {
+        mHandler = handler;
+        this.context = context;
+        this.sipper = sipper;
+        switch (sipper.drainType) {
+            case IDLE:
+                name = context.getResources().getString(R.string.power_idle);
+                iconId = R.drawable.ic_settings_phone_idle;
+                break;
+            case CELL:
+                name = context.getResources().getString(R.string.power_cell);
+                iconId = R.drawable.ic_settings_cell_standby;
+                break;
+            case PHONE:
+                name = context.getResources().getString(R.string.power_phone);
+                iconId = R.drawable.ic_settings_voice_calls;
+                break;
+            case WIFI:
+                name = context.getResources().getString(R.string.power_wifi);
+                iconId = R.drawable.ic_settings_wifi;
+                break;
+            case BLUETOOTH:
+                name = context.getResources().getString(R.string.power_bluetooth);
+                iconId = R.drawable.ic_settings_bluetooth;
+                break;
+            case SCREEN:
+                name = context.getResources().getString(R.string.power_screen);
+                iconId = R.drawable.ic_settings_display;
+                break;
+            case APP:
+                name = sipper.packageWithHighestDrain;
+                break;
+            case USER: {
+                UserInfo info = um.getUserInfo(sipper.userId);
+                if (info != null) {
+                    icon = UserUtils.getUserIcon(context, um, info, context.getResources());
+                    name = info != null ? info.name : null;
+                    if (name == null) {
+                        name = Integer.toString(info.id);
+                    }
+                    name = context.getResources().getString(
+                            R.string.running_process_item_user_label, name);
+                } else {
+                    icon = null;
+                    name = context.getResources().getString(
+                            R.string.running_process_item_removed_user_label);
+                }
+            } break;
+            case UNACCOUNTED:
+                name = context.getResources().getString(R.string.power_unaccounted);
+                iconId = R.drawable.ic_power_system;
+                break;
+            case OVERCOUNTED:
+                name = context.getResources().getString(R.string.power_overcounted);
+                iconId = R.drawable.ic_power_system;
+                break;
+        }
+        if (iconId > 0) {
+            icon = context.getResources().getDrawable(iconId);
+        }
+        if ((name == null || iconId == 0) && this.sipper.uidObj != null) {
+            getQuickNameIconForUid(this.sipper.uidObj);
+        }
+    }
+
+    public Drawable getIcon() {
+        return icon;
+    }
+
+    /**
+     * Gets the application name
+     */
+    public String getLabel() {
+        return name;
+    }
+
+    void getQuickNameIconForUid(BatteryStats.Uid uidObj) {
+        final int uid = uidObj.getUid();
+        final String uidString = Integer.toString(uid);
+        if (sUidCache.containsKey(uidString)) {
+            UidToDetail utd = sUidCache.get(uidString);
+            defaultPackageName = utd.packageName;
+            name = utd.name;
+            icon = utd.icon;
+            return;
+        }
+        PackageManager pm = context.getPackageManager();
+        String[] packages = pm.getPackagesForUid(uid);
+        icon = pm.getDefaultActivityIcon();
+        if (packages == null) {
+            //name = Integer.toString(uid);
+            if (uid == 0) {
+                name = context.getResources().getString(R.string.process_kernel_label);
+            } else if ("mediaserver".equals(name)) {
+                name = context.getResources().getString(R.string.process_mediaserver_label);
+            }
+            iconId = R.drawable.ic_power_system;
+            icon = context.getResources().getDrawable(iconId);
+            return;
+        } else {
+            //name = packages[0];
+        }
+        if (mHandler != null) {
+            synchronized (mRequestQueue) {
+                mRequestQueue.add(this);
+            }
+        }
+    }
+
+    /**
+     * Loads the app label and icon image and stores into the cache.
+     */
+    public void loadNameAndIcon() {
+        // Bail out if the current sipper is not an App sipper.
+        if (sipper.uidObj == null) {
+            return;
+        }
+        PackageManager pm = context.getPackageManager();
+        final int uid = sipper.uidObj.getUid();
+        final Drawable defaultActivityIcon = pm.getDefaultActivityIcon();
+        sipper.mPackages = pm.getPackagesForUid(uid);
+        if (sipper.mPackages == null) {
+            name = Integer.toString(uid);
+            return;
+        }
+
+        String[] packageLabels = new String[sipper.mPackages.length];
+        System.arraycopy(sipper.mPackages, 0, packageLabels, 0, sipper.mPackages.length);
+
+        int preferredIndex = -1;
+        // Convert package names to user-facing labels where possible
+        for (int i = 0; i < packageLabels.length; i++) {
+            // Check if package matches preferred package
+            if (packageLabels[i].equals(name)) preferredIndex = i;
+            try {
+                ApplicationInfo ai = pm.getApplicationInfo(packageLabels[i], 0);
+                CharSequence label = ai.loadLabel(pm);
+                if (label != null) {
+                    packageLabels[i] = label.toString();
+                }
+                if (ai.icon != 0) {
+                    defaultPackageName = sipper.mPackages[i];
+                    icon = ai.loadIcon(pm);
+                    break;
+                }
+            } catch (PackageManager.NameNotFoundException e) {
+            }
+        }
+        if (icon == null) icon = defaultActivityIcon;
+
+        if (packageLabels.length == 1) {
+            name = packageLabels[0];
+        } else {
+            // Look for an official name for this UID.
+            for (String pkgName : sipper.mPackages) {
+                try {
+                    final PackageInfo pi = pm.getPackageInfo(pkgName, 0);
+                    if (pi.sharedUserLabel != 0) {
+                        final CharSequence nm = pm.getText(pkgName,
+                                pi.sharedUserLabel, pi.applicationInfo);
+                        if (nm != null) {
+                            name = nm.toString();
+                            if (pi.applicationInfo.icon != 0) {
+                                defaultPackageName = pkgName;
+                                icon = pi.applicationInfo.loadIcon(pm);
+                            }
+                            break;
+                        }
+                    }
+                } catch (PackageManager.NameNotFoundException e) {
+                }
+            }
+        }
+        final String uidString = Integer.toString(sipper.uidObj.getUid());
+        UidToDetail utd = new UidToDetail();
+        utd.name = name;
+        utd.icon = icon;
+        utd.packageName = defaultPackageName;
+        sUidCache.put(uidString, utd);
+        if (mHandler != null) {
+            mHandler.sendMessage(mHandler.obtainMessage(MSG_UPDATE_NAME_ICON, this));
+        }
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatterySipper.java b/src/com/android/settings/fuelgauge/BatterySipper.java
deleted file mode 100644
index d1f885c..0000000
--- a/src/com/android/settings/fuelgauge/BatterySipper.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import com.android.settings.R;
-import com.android.settings.fuelgauge.PowerUsageDetail.DrainType;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.os.BatteryStats.Uid;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-/**
- * Contains information about package name, icon image, power usage about an
- * application or a system service.
- */
-public class BatterySipper implements Comparable<BatterySipper> {
-    final Context mContext;
-    /* Cache cleared when PowerUsageSummary is destroyed */
-    static final HashMap<String,UidToDetail> sUidCache = new HashMap<String,UidToDetail>();
-    final ArrayList<BatterySipper> mRequestQueue;
-    final Handler mHandler;
-    String name;
-    Drawable icon;
-    int iconId; // For passing to the detail screen.
-    Uid uidObj;
-    double value;
-    double[] values;
-    DrainType drainType;
-    long usageTime;
-    long cpuTime;
-    long gpsTime;
-    long wifiRunningTime;
-    long cpuFgTime;
-    long wakeLockTime;
-    long mobileRxPackets;
-    long mobileTxPackets;
-    long wifiRxPackets;
-    long wifiTxPackets;
-    long mobileRxBytes;
-    long mobileTxBytes;
-    long wifiRxBytes;
-    long wifiTxBytes;
-    double percent;
-    double noCoveragePercent;
-    String defaultPackageName;
-    String[] mPackages;
-
-    static class UidToDetail {
-        String name;
-        String packageName;
-        Drawable icon;
-    }
-
-    BatterySipper(Context context, ArrayList<BatterySipper> requestQueue,
-            Handler handler, String label, DrainType drainType,
-            int iconId, Uid uid, double[] values) {
-        mContext = context;
-        mRequestQueue = requestQueue;
-        mHandler = handler;
-        this.values = values;
-        name = label;
-        this.drainType = drainType;
-        if (iconId > 0) {
-            icon = mContext.getResources().getDrawable(iconId);
-        }
-        if (values != null) value = values[0];
-        if ((label == null || iconId == 0) && uid != null) {
-            getQuickNameIconForUid(uid);
-        }
-        uidObj = uid;
-    }
-
-    double getSortValue() {
-        return value;
-    }
-
-    double[] getValues() {
-        return values;
-    }
-
-    public Drawable getIcon() {
-        return icon;
-    }
-
-    /**
-     * Gets the application name
-     */
-    public String getLabel() {
-        return name;
-    }
-
-    @Override
-    public int compareTo(BatterySipper other) {
-        // Return the flipped value because we want the items in descending order
-        return Double.compare(other.getSortValue(), getSortValue());
-    }
-
-    /**
-     * Gets a list of packages associated with the current user
-     */
-    public String[] getPackages() {
-        return mPackages;
-    }
-
-    public int getUid() {
-        // Bail out if the current sipper is not an App sipper.
-        if (uidObj == null) {
-            return 0;
-        }
-        return uidObj.getUid();
-    }
-
-    void getQuickNameIconForUid(Uid uidObj) {
-        final int uid = uidObj.getUid();
-        final String uidString = Integer.toString(uid);
-        if (sUidCache.containsKey(uidString)) {
-            UidToDetail utd = sUidCache.get(uidString);
-            defaultPackageName = utd.packageName;
-            name = utd.name;
-            icon = utd.icon;
-            return;
-        }
-        PackageManager pm = mContext.getPackageManager();
-        String[] packages = pm.getPackagesForUid(uid);
-        icon = pm.getDefaultActivityIcon();
-        if (packages == null) {
-            //name = Integer.toString(uid);
-            if (uid == 0) {
-                name = mContext.getResources().getString(R.string.process_kernel_label);
-            } else if ("mediaserver".equals(name)) {
-                name = mContext.getResources().getString(R.string.process_mediaserver_label);
-            }
-            iconId = R.drawable.ic_power_system;
-            icon = mContext.getResources().getDrawable(iconId);
-            return;
-        } else {
-            //name = packages[0];
-        }
-        if (mHandler != null) {
-            synchronized (mRequestQueue) {
-                mRequestQueue.add(this);
-            }
-        }
-    }
-
-    public static void clearUidCache() {
-        sUidCache.clear();
-    }
-
-    /**
-     * Loads the app label and icon image and stores into the cache.
-     */
-    public void loadNameAndIcon() {
-        // Bail out if the current sipper is not an App sipper.
-        if (uidObj == null) {
-            return;
-        }
-        PackageManager pm = mContext.getPackageManager();
-        final int uid = uidObj.getUid();
-        final Drawable defaultActivityIcon = pm.getDefaultActivityIcon();
-        mPackages = pm.getPackagesForUid(uid);
-        if (mPackages == null) {
-            name = Integer.toString(uid);
-            return;
-        }
-
-        String[] packageLabels = new String[mPackages.length];
-        System.arraycopy(mPackages, 0, packageLabels, 0, mPackages.length);
-
-        int preferredIndex = -1;
-        // Convert package names to user-facing labels where possible
-        for (int i = 0; i < packageLabels.length; i++) {
-            // Check if package matches preferred package
-            if (packageLabels[i].equals(name)) preferredIndex = i;
-            try {
-                ApplicationInfo ai = pm.getApplicationInfo(packageLabels[i], 0);
-                CharSequence label = ai.loadLabel(pm);
-                if (label != null) {
-                    packageLabels[i] = label.toString();
-                }
-                if (ai.icon != 0) {
-                    defaultPackageName = mPackages[i];
-                    icon = ai.loadIcon(pm);
-                    break;
-                }
-            } catch (NameNotFoundException e) {
-            }
-        }
-        if (icon == null) icon = defaultActivityIcon;
-
-        if (packageLabels.length == 1) {
-            name = packageLabels[0];
-        } else {
-            // Look for an official name for this UID.
-            for (String pkgName : mPackages) {
-                try {
-                    final PackageInfo pi = pm.getPackageInfo(pkgName, 0);
-                    if (pi.sharedUserLabel != 0) {
-                        final CharSequence nm = pm.getText(pkgName,
-                                pi.sharedUserLabel, pi.applicationInfo);
-                        if (nm != null) {
-                            name = nm.toString();
-                            if (pi.applicationInfo.icon != 0) {
-                                defaultPackageName = pkgName;
-                                icon = pi.applicationInfo.loadIcon(pm);
-                            }
-                            break;
-                        }
-                    }
-                } catch (PackageManager.NameNotFoundException e) {
-                }
-            }
-        }
-        final String uidString = Integer.toString(uidObj.getUid());
-        UidToDetail utd = new UidToDetail();
-        utd.name = name;
-        utd.icon = icon;
-        utd.packageName = defaultPackageName;
-        sUidCache.put(uidString, utd);
-        if (mHandler != null) {
-            mHandler.sendMessage(
-                    mHandler.obtainMessage(BatteryStatsHelper.MSG_UPDATE_NAME_ICON, this));
-        }
-    }
-}
diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
deleted file mode 100644
index a02917e..0000000
--- a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
+++ /dev/null
@@ -1,907 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import static android.os.BatteryStats.NETWORK_MOBILE_RX_DATA;
-import static android.os.BatteryStats.NETWORK_MOBILE_TX_DATA;
-import static android.os.BatteryStats.NETWORK_WIFI_RX_DATA;
-import static android.os.BatteryStats.NETWORK_WIFI_TX_DATA;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.UserInfo;
-import android.graphics.drawable.Drawable;
-import android.hardware.Sensor;
-import android.hardware.SensorManager;
-import android.os.BatteryStats;
-import android.os.BatteryStats.Uid;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Parcel;
-import android.os.Process;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.SystemClock;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.preference.PreferenceActivity;
-import android.telephony.SignalStrength;
-import android.util.Log;
-import android.util.SparseArray;
-
-import com.android.internal.app.IBatteryStats;
-import com.android.internal.os.BatteryStatsImpl;
-import com.android.internal.os.PowerProfile;
-import com.android.internal.util.FastPrintWriter;
-import com.android.settings.R;
-import com.android.settings.fuelgauge.PowerUsageDetail.DrainType;
-import com.android.settings.users.UserUtils;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A helper class for retrieving the power usage information for all applications and services.
- *
- * The caller must initialize this class as soon as activity object is ready to use (for example, in
- * onAttach() for Fragment), call create() in onCreate() and call destroy() in onDestroy().
- */
-public class BatteryStatsHelper {
-
-    private static final boolean DEBUG = false;
-
-    private static final String TAG = BatteryStatsHelper.class.getSimpleName();
-
-    private static BatteryStatsImpl sStatsXfer;
-    private IBatteryStats mBatteryInfo;
-    private UserManager mUm;
-    private BatteryStatsImpl mStats;
-    private PowerProfile mPowerProfile;
-
-    private final List<BatterySipper> mUsageList = new ArrayList<BatterySipper>();
-    private final List<BatterySipper> mWifiSippers = new ArrayList<BatterySipper>();
-    private final List<BatterySipper> mBluetoothSippers = new ArrayList<BatterySipper>();
-    private final SparseArray<List<BatterySipper>> mUserSippers
-            = new SparseArray<List<BatterySipper>>();
-    private final SparseArray<Double> mUserPower = new SparseArray<Double>();
-
-    private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
-
-    private long mStatsPeriod = 0;
-    private double mMaxPower = 1;
-    private double mTotalPower;
-    private double mTotalPowermAh;
-    private double mWifiPower;
-    private double mBluetoothPower;
-    private double mMinDrainedPower;
-    private double mMaxDrainedPower;
-
-    // How much the apps together have left WIFI running.
-    private long mAppWifiRunning;
-
-    /** Queue for fetching name and icon for an application */
-    private ArrayList<BatterySipper> mRequestQueue = new ArrayList<BatterySipper>();
-
-    private Activity mActivity;
-    private Handler mHandler;
-
-    private class NameAndIconLoader extends Thread {
-        private boolean mAbort = false;
-
-        public NameAndIconLoader() {
-            super("BatteryUsage Icon Loader");
-        }
-
-        public void abort() {
-            mAbort = true;
-        }
-
-        @Override
-        public void run() {
-            while (true) {
-                BatterySipper bs;
-                synchronized (mRequestQueue) {
-                    if (mRequestQueue.isEmpty() || mAbort) {
-                        mHandler.sendEmptyMessage(MSG_REPORT_FULLY_DRAWN);
-                        return;
-                    }
-                    bs = mRequestQueue.remove(0);
-                }
-                bs.loadNameAndIcon();
-            }
-        }
-    }
-
-    private NameAndIconLoader mRequestThread;
-
-    public BatteryStatsHelper(Activity activity, Handler handler) {
-        mActivity = activity;
-        mHandler = handler;
-    }
-
-    /** Clears the current stats and forces recreating for future use. */
-    public void clearStats() {
-        mStats = null;
-    }
-
-    public BatteryStatsImpl getStats() {
-        if (mStats == null) {
-            load();
-        }
-        return mStats;
-    }
-
-    public PowerProfile getPowerProfile() {
-        return mPowerProfile;
-    }
-
-    public void create(Bundle icicle) {
-        if (icicle != null) {
-            mStats = sStatsXfer;
-        }
-        mBatteryInfo = IBatteryStats.Stub.asInterface(
-                ServiceManager.getService(BatteryStats.SERVICE_NAME));
-        mUm = (UserManager) mActivity.getSystemService(Context.USER_SERVICE);
-        mPowerProfile = new PowerProfile(mActivity);
-    }
-
-    public void pause() {
-        if (mRequestThread != null) {
-            mRequestThread.abort();
-        }
-    }
-
-    public void destroy() {
-        if (mActivity.isChangingConfigurations()) {
-            sStatsXfer = mStats;
-        } else {
-            BatterySipper.sUidCache.clear();
-        }
-    }
-
-    public void startBatteryDetailPage(
-            PreferenceActivity caller, BatterySipper sipper, boolean showLocationButton) {
-        // Initialize mStats if necessary.
-        getStats();
-
-        Bundle args = new Bundle();
-        args.putString(PowerUsageDetail.EXTRA_TITLE, sipper.name);
-        args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int)
-                Math.ceil(sipper.getSortValue() * 100 / mTotalPower));
-        args.putInt(PowerUsageDetail.EXTRA_GAUGE, (int)
-                Math.ceil(sipper.getSortValue() * 100 / mMaxPower));
-        args.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, mStatsPeriod);
-        args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, sipper.defaultPackageName);
-        args.putInt(PowerUsageDetail.EXTRA_ICON_ID, sipper.iconId);
-        args.putDouble(PowerUsageDetail.EXTRA_NO_COVERAGE, sipper.noCoveragePercent);
-        if (sipper.uidObj != null) {
-            args.putInt(PowerUsageDetail.EXTRA_UID, sipper.uidObj.getUid());
-        }
-        args.putSerializable(PowerUsageDetail.EXTRA_DRAIN_TYPE, sipper.drainType);
-        args.putBoolean(PowerUsageDetail.EXTRA_SHOW_LOCATION_BUTTON, showLocationButton);
-
-        int[] types;
-        double[] values;
-        switch (sipper.drainType) {
-            case APP:
-            case USER:
-            {
-                Uid uid = sipper.uidObj;
-                types = new int[] {
-                    R.string.usage_type_cpu,
-                    R.string.usage_type_cpu_foreground,
-                    R.string.usage_type_wake_lock,
-                    R.string.usage_type_gps,
-                    R.string.usage_type_wifi_running,
-                    R.string.usage_type_data_recv,
-                    R.string.usage_type_data_send,
-                    R.string.usage_type_data_wifi_recv,
-                    R.string.usage_type_data_wifi_send,
-                    R.string.usage_type_audio,
-                    R.string.usage_type_video,
-                };
-                values = new double[] {
-                    sipper.cpuTime,
-                    sipper.cpuFgTime,
-                    sipper.wakeLockTime,
-                    sipper.gpsTime,
-                    sipper.wifiRunningTime,
-                    sipper.mobileRxPackets,
-                    sipper.mobileTxPackets,
-                    sipper.wifiRxPackets,
-                    sipper.wifiTxPackets,
-                    0,
-                    0
-                };
-
-                if (sipper.drainType == DrainType.APP) {
-                    Writer result = new StringWriter();
-                    PrintWriter printWriter = new FastPrintWriter(result, false, 1024);
-                    mStats.dumpLocked(printWriter, "", mStatsType, uid.getUid());
-                    printWriter.flush();
-                    args.putString(PowerUsageDetail.EXTRA_REPORT_DETAILS, result.toString());
-
-                    result = new StringWriter();
-                    printWriter = new FastPrintWriter(result, false, 1024);
-                    mStats.dumpCheckinLocked(printWriter, mStatsType, uid.getUid());
-                    printWriter.flush();
-                    args.putString(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS,
-                            result.toString());
-                }
-            }
-            break;
-            case CELL:
-            {
-                types = new int[] {
-                    R.string.usage_type_on_time,
-                    R.string.usage_type_no_coverage
-                };
-                values = new double[] {
-                    sipper.usageTime,
-                    sipper.noCoveragePercent
-                };
-            }
-            break;
-            case WIFI:
-            {
-                types = new int[] {
-                    R.string.usage_type_wifi_running,
-                    R.string.usage_type_cpu,
-                    R.string.usage_type_cpu_foreground,
-                    R.string.usage_type_wake_lock,
-                    R.string.usage_type_data_recv,
-                    R.string.usage_type_data_send,
-                    R.string.usage_type_data_wifi_recv,
-                    R.string.usage_type_data_wifi_send,
-                };
-                values = new double[] {
-                    sipper.usageTime,
-                    sipper.cpuTime,
-                    sipper.cpuFgTime,
-                    sipper.wakeLockTime,
-                    sipper.mobileRxPackets,
-                    sipper.mobileTxPackets,
-                    sipper.wifiRxPackets,
-                    sipper.wifiTxPackets,
-                };
-            } break;
-            case BLUETOOTH:
-            {
-                types = new int[] {
-                    R.string.usage_type_on_time,
-                    R.string.usage_type_cpu,
-                    R.string.usage_type_cpu_foreground,
-                    R.string.usage_type_wake_lock,
-                    R.string.usage_type_data_recv,
-                    R.string.usage_type_data_send,
-                    R.string.usage_type_data_wifi_recv,
-                    R.string.usage_type_data_wifi_send,
-                };
-                values = new double[] {
-                    sipper.usageTime,
-                    sipper.cpuTime,
-                    sipper.cpuFgTime,
-                    sipper.wakeLockTime,
-                    sipper.mobileRxPackets,
-                    sipper.mobileTxPackets,
-                    sipper.wifiRxPackets,
-                    sipper.wifiTxPackets,
-                };
-            } break;
-            case UNACCOUNTED:
-            case OVERCOUNTED:
-            {
-                types = new int[] {
-                    R.string.usage_type_total_battery_capacity,
-                    R.string.usage_type_computed_power,
-                    R.string.usage_type_min_actual_power,
-                    R.string.usage_type_max_actual_power,
-                };
-                values = new double[] {
-                    mPowerProfile.getBatteryCapacity(),
-                    mTotalPowermAh,
-                    mMinDrainedPower,
-                    mMaxDrainedPower,
-                };
-            } break;
-            default:
-            {
-                types = new int[] {
-                    R.string.usage_type_on_time
-                };
-                values = new double[] {
-                    sipper.usageTime
-                };
-            }
-        }
-        args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
-        args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
-        caller.startPreferencePanel(PowerUsageDetail.class.getName(), args,
-                R.string.details_title, null, null, 0);
-    }
-
-    /**
-     * Refreshes the power usage list.
-     * @param includeZeroConsumption whether includes those applications which have consumed very
-     *                               little power up till now.
-     */
-    public void refreshStats(boolean includeZeroConsumption) {
-        // Initialize mStats if necessary.
-        getStats();
-
-        mMaxPower = 0;
-        mTotalPower = 0;
-        mWifiPower = 0;
-        mBluetoothPower = 0;
-        mAppWifiRunning = 0;
-
-        mUsageList.clear();
-        mWifiSippers.clear();
-        mBluetoothSippers.clear();
-        mUserSippers.clear();
-        mUserPower.clear();
-
-        mMinDrainedPower = (mStats.getLowDischargeAmountSinceCharge()
-                * mPowerProfile.getBatteryCapacity()) / 100;
-        mMaxDrainedPower = (mStats.getHighDischargeAmountSinceCharge()
-                * mPowerProfile.getBatteryCapacity()) / 100;
-
-        processAppUsage(includeZeroConsumption);
-        processMiscUsage();
-
-        // We have been computing totals in seconds, convert to hours.
-        mTotalPowermAh = mTotalPower / 3600;
-
-        if (true || mStats.getLowDischargeAmountSinceCharge() > 10) {
-            if (mMinDrainedPower > mTotalPowermAh) {
-                double amount = mMinDrainedPower - mTotalPowermAh;
-                if (mMaxPower < amount) {
-                    mMaxPower = amount;
-                }
-                addEntryNoTotal(mActivity.getString(R.string.power_unaccounted),
-                        DrainType.UNACCOUNTED, 0, R.drawable.ic_power_system, amount * 3600);
-            } else if (mMaxDrainedPower < mTotalPowermAh) {
-                double amount = mTotalPowermAh - mMaxDrainedPower;
-                if (mMaxPower < amount) {
-                    mMaxPower = amount;
-                }
-                addEntryNoTotal(mActivity.getString(R.string.power_overcounted),
-                        DrainType.OVERCOUNTED, 0, R.drawable.ic_power_system, amount * 3600);
-            }
-        }
-
-        Collections.sort(mUsageList);
-
-        if (mHandler != null) {
-            synchronized (mRequestQueue) {
-                if (!mRequestQueue.isEmpty()) {
-                    if (mRequestThread != null) {
-                        mRequestThread.abort();
-                    }
-                    mRequestThread = new NameAndIconLoader();
-                    mRequestThread.setPriority(Thread.MIN_PRIORITY);
-                    mRequestThread.start();
-                    mRequestQueue.notify();
-                }
-            }
-        }
-    }
-
-    private void processAppUsage(boolean includeZeroConsumption) {
-        SensorManager sensorManager = (SensorManager) mActivity.getSystemService(
-                Context.SENSOR_SERVICE);
-        final int which = mStatsType;
-        final int speedSteps = mPowerProfile.getNumSpeedSteps();
-        final double[] powerCpuNormal = new double[speedSteps];
-        final long[] cpuSpeedStepTimes = new long[speedSteps];
-        for (int p = 0; p < speedSteps; p++) {
-            powerCpuNormal[p] = mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_ACTIVE, p);
-        }
-        final double mobilePowerPerPacket = getMobilePowerPerPacket();
-        final double wifiPowerPerPacket = getWifiPowerPerPacket();
-        long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, which);
-        long appWakelockTime = 0;
-        BatterySipper osApp = null;
-        mStatsPeriod = uSecTime;
-        SparseArray<? extends Uid> uidStats = mStats.getUidStats();
-        final int NU = uidStats.size();
-        for (int iu = 0; iu < NU; iu++) {
-            Uid u = uidStats.valueAt(iu);
-            double p; // in mAs
-            double power = 0; // in mAs
-            double highestDrain = 0;
-            String packageWithHighestDrain = null;
-            //mUsageList.add(new AppUsage(u.getUid(), new double[] {power}));
-            Map<String, ? extends BatteryStats.Uid.Proc> processStats = u.getProcessStats();
-            long cpuTime = 0;
-            long cpuFgTime = 0;
-            long wakelockTime = 0;
-            long gpsTime = 0;
-            if (DEBUG) Log.i(TAG, "UID " + u.getUid());
-            if (processStats.size() > 0) {
-                // Process CPU time
-                for (Map.Entry<String, ? extends BatteryStats.Uid.Proc> ent
-                        : processStats.entrySet()) {
-                    Uid.Proc ps = ent.getValue();
-                    final long userTime = ps.getUserTime(which);
-                    final long systemTime = ps.getSystemTime(which);
-                    final long foregroundTime = ps.getForegroundTime(which);
-                    cpuFgTime += foregroundTime * 10; // convert to millis
-                    final long tmpCpuTime = (userTime + systemTime) * 10; // convert to millis
-                    int totalTimeAtSpeeds = 0;
-                    // Get the total first
-                    for (int step = 0; step < speedSteps; step++) {
-                        cpuSpeedStepTimes[step] = ps.getTimeAtCpuSpeedStep(step, which);
-                        totalTimeAtSpeeds += cpuSpeedStepTimes[step];
-                    }
-                    if (totalTimeAtSpeeds == 0) totalTimeAtSpeeds = 1;
-                    // Then compute the ratio of time spent at each speed
-                    double processPower = 0;
-                    for (int step = 0; step < speedSteps; step++) {
-                        double ratio = (double) cpuSpeedStepTimes[step] / totalTimeAtSpeeds;
-                        processPower += ratio * tmpCpuTime * powerCpuNormal[step];
-                    }
-                    cpuTime += tmpCpuTime;
-                    if (DEBUG && processPower != 0) {
-                        Log.i(TAG, String.format("process %s, cpu power=%.2f",
-                                ent.getKey(), processPower / 1000));
-                    }
-                    power += processPower;
-                    if (packageWithHighestDrain == null
-                            || packageWithHighestDrain.startsWith("*")) {
-                        highestDrain = processPower;
-                        packageWithHighestDrain = ent.getKey();
-                    } else if (highestDrain < processPower
-                            && !ent.getKey().startsWith("*")) {
-                        highestDrain = processPower;
-                        packageWithHighestDrain = ent.getKey();
-                    }
-                }
-            }
-            if (cpuFgTime > cpuTime) {
-                if (DEBUG && cpuFgTime > cpuTime + 10000) {
-                    Log.i(TAG, "WARNING! Cputime is more than 10 seconds behind Foreground time");
-                }
-                cpuTime = cpuFgTime; // Statistics may not have been gathered yet.
-            }
-            power /= 1000;
-            if (DEBUG && power != 0) Log.i(TAG, String.format("total cpu power=%.2f", power));
-
-            // Process wake lock usage
-            Map<String, ? extends BatteryStats.Uid.Wakelock> wakelockStats = u.getWakelockStats();
-            for (Map.Entry<String, ? extends BatteryStats.Uid.Wakelock> wakelockEntry
-                    : wakelockStats.entrySet()) {
-                Uid.Wakelock wakelock = wakelockEntry.getValue();
-                // Only care about partial wake locks since full wake locks
-                // are canceled when the user turns the screen off.
-                BatteryStats.Timer timer = wakelock.getWakeTime(BatteryStats.WAKE_TYPE_PARTIAL);
-                if (timer != null) {
-                    wakelockTime += timer.getTotalTimeLocked(uSecTime, which);
-                }
-            }
-            wakelockTime /= 1000; // convert to millis
-            appWakelockTime += wakelockTime;
-
-            // Add cost of holding a wake lock
-            p = (wakelockTime
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
-            power += p;
-            if (DEBUG && p != 0) Log.i(TAG, String.format("wakelock power=%.2f", p));
-
-            // Add cost of mobile traffic
-            final long mobileRx = u.getNetworkActivityPackets(NETWORK_MOBILE_RX_DATA, mStatsType);
-            final long mobileTx = u.getNetworkActivityPackets(NETWORK_MOBILE_TX_DATA, mStatsType);
-            final long mobileRxB = u.getNetworkActivityBytes(NETWORK_MOBILE_RX_DATA, mStatsType);
-            final long mobileTxB = u.getNetworkActivityBytes(NETWORK_MOBILE_TX_DATA, mStatsType);
-            p = (mobileRx + mobileTx) * mobilePowerPerPacket;
-            power += p;
-            if (DEBUG && p != 0) Log.i(TAG, String.format("mobile power=%.2f", p));
-
-            // Add cost of wifi traffic
-            final long wifiRx = u.getNetworkActivityPackets(NETWORK_WIFI_RX_DATA, mStatsType);
-            final long wifiTx = u.getNetworkActivityPackets(NETWORK_WIFI_TX_DATA, mStatsType);
-            final long wifiRxB = u.getNetworkActivityBytes(NETWORK_WIFI_RX_DATA, mStatsType);
-            final long wifiTxB = u.getNetworkActivityBytes(NETWORK_WIFI_TX_DATA, mStatsType);
-            p = (wifiRx + wifiTx) * wifiPowerPerPacket;
-            power += p;
-            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi power=%.2f", p));
-
-            // Add cost of keeping WIFI running.
-            long wifiRunningTimeMs = u.getWifiRunningTime(uSecTime, which) / 1000;
-            mAppWifiRunning += wifiRunningTimeMs;
-            p = (wifiRunningTimeMs
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
-            power += p;
-            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi running power=%.2f", p));
-
-            // Add cost of WIFI scans
-            long wifiScanTimeMs = u.getWifiScanTime(uSecTime, which) / 1000;
-            p = (wifiScanTimeMs
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_SCAN)) / 1000;
-            power += p;
-            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi scanning power=%.2f", p));
-            for (int bin = 0; bin < BatteryStats.Uid.NUM_WIFI_BATCHED_SCAN_BINS; bin++) {
-                long batchScanTimeMs = u.getWifiBatchedScanTime(bin, uSecTime, which) / 1000;
-                p = (batchScanTimeMs
-                        * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_BATCHED_SCAN, bin));
-                power += p;
-                if (DEBUG && p != 0) {
-                    Log.i(TAG, String.format("wifi batched scanning lvl %d = %.2f", bin, p));
-                }
-            }
-
-            // Process Sensor usage
-            Map<Integer, ? extends BatteryStats.Uid.Sensor> sensorStats = u.getSensorStats();
-            for (Map.Entry<Integer, ? extends BatteryStats.Uid.Sensor> sensorEntry
-                    : sensorStats.entrySet()) {
-                Uid.Sensor sensor = sensorEntry.getValue();
-                int sensorHandle = sensor.getHandle();
-                BatteryStats.Timer timer = sensor.getSensorTime();
-                long sensorTime = timer.getTotalTimeLocked(uSecTime, which) / 1000;
-                double multiplier = 0;
-                switch (sensorHandle) {
-                    case Uid.Sensor.GPS:
-                        multiplier = mPowerProfile.getAveragePower(PowerProfile.POWER_GPS_ON);
-                        gpsTime = sensorTime;
-                        break;
-                    default:
-                        List<Sensor> sensorList = sensorManager.getSensorList(
-                                android.hardware.Sensor.TYPE_ALL);
-                        for (android.hardware.Sensor s : sensorList) {
-                            if (s.getHandle() == sensorHandle) {
-                                multiplier = s.getPower();
-                                break;
-                            }
-                        }
-                }
-                p = (multiplier * sensorTime) / 1000;
-                power += p;
-                if (DEBUG && p != 0) {
-                    Log.i(TAG, String.format("sensor %s power=%.2f", sensor.toString(), p));
-                }
-            }
-
-            if (DEBUG) Log.i(TAG, String.format("UID %d total power=%.2f", u.getUid(), power));
-
-            // Add the app to the list if it is consuming power
-            boolean isOtherUser = false;
-            final int userId = UserHandle.getUserId(u.getUid());
-            if (power != 0 || includeZeroConsumption || u.getUid() == 0) {
-                BatterySipper app = new BatterySipper(mActivity, mRequestQueue, mHandler,
-                        packageWithHighestDrain, DrainType.APP, 0, u,
-                        new double[] {power});
-                app.cpuTime = cpuTime;
-                app.gpsTime = gpsTime;
-                app.wifiRunningTime = wifiRunningTimeMs;
-                app.cpuFgTime = cpuFgTime;
-                app.wakeLockTime = wakelockTime;
-                app.mobileRxPackets = mobileRx;
-                app.mobileTxPackets = mobileTx;
-                app.wifiRxPackets = wifiRx;
-                app.wifiTxPackets = wifiTx;
-                app.mobileRxBytes = mobileRxB;
-                app.mobileTxBytes = mobileTxB;
-                app.wifiRxBytes = wifiRxB;
-                app.wifiTxBytes = wifiTxB;
-                if (u.getUid() == Process.WIFI_UID) {
-                    mWifiSippers.add(app);
-                } else if (u.getUid() == Process.BLUETOOTH_UID) {
-                    mBluetoothSippers.add(app);
-                } else if (userId != UserHandle.myUserId()
-                        && UserHandle.getAppId(u.getUid()) >= Process.FIRST_APPLICATION_UID) {
-                    isOtherUser = true;
-                    List<BatterySipper> list = mUserSippers.get(userId);
-                    if (list == null) {
-                        list = new ArrayList<BatterySipper>();
-                        mUserSippers.put(userId, list);
-                    }
-                    list.add(app);
-                } else {
-                    mUsageList.add(app);
-                }
-                if (u.getUid() == 0) {
-                    osApp = app;
-                }
-            }
-            if (power != 0 || includeZeroConsumption) {
-                if (u.getUid() == Process.WIFI_UID) {
-                    mWifiPower += power;
-                } else if (u.getUid() == Process.BLUETOOTH_UID) {
-                    mBluetoothPower += power;
-                } else if (isOtherUser) {
-                    Double userPower = mUserPower.get(userId);
-                    if (userPower == null) {
-                        userPower = power;
-                    } else {
-                        userPower += power;
-                    }
-                    mUserPower.put(userId, userPower);
-                } else {
-                    if (power > mMaxPower) mMaxPower = power;
-                    mTotalPower += power;
-                }
-            }
-        }
-
-        // The device has probably been awake for longer than the screen on
-        // time and application wake lock time would account for.  Assign
-        // this remainder to the OS, if possible.
-        if (osApp != null) {
-            long wakeTimeMillis = mStats.computeBatteryUptime(
-                    SystemClock.uptimeMillis() * 1000, which) / 1000;
-            wakeTimeMillis -= appWakelockTime + (mStats.getScreenOnTime(
-                    SystemClock.elapsedRealtime(), which) / 1000);
-            if (wakeTimeMillis > 0) {
-                double power = (wakeTimeMillis
-                        * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
-                if (DEBUG) Log.i(TAG, "OS wakeLockTime " + wakeTimeMillis + " power " + power);
-                osApp.wakeLockTime += wakeTimeMillis;
-                osApp.value += power;
-                osApp.values[0] += power;
-                if (osApp.value > mMaxPower) mMaxPower = osApp.value;
-                mTotalPower += power;
-            }
-        }
-    }
-
-    private void addPhoneUsage(long uSecNow) {
-        long phoneOnTimeMs = mStats.getPhoneOnTime(uSecNow, mStatsType) / 1000;
-        double phoneOnPower = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
-                * phoneOnTimeMs / 1000;
-        addEntry(mActivity.getString(R.string.power_phone), DrainType.PHONE, phoneOnTimeMs,
-                R.drawable.ic_settings_voice_calls, phoneOnPower);
-    }
-
-    private void addScreenUsage(long uSecNow) {
-        double power = 0;
-        long screenOnTimeMs = mStats.getScreenOnTime(uSecNow, mStatsType) / 1000;
-        power += screenOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_ON);
-        final double screenFullPower =
-                mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
-        for (int i = 0; i < BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS; i++) {
-            double screenBinPower = screenFullPower * (i + 0.5f)
-                    / BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS;
-            long brightnessTime = mStats.getScreenBrightnessTime(i, uSecNow, mStatsType) / 1000;
-            power += screenBinPower * brightnessTime;
-            if (DEBUG) {
-                Log.i(TAG, "Screen bin power = " + (int) screenBinPower + ", time = "
-                        + brightnessTime);
-            }
-        }
-        power /= 1000; // To seconds
-        addEntry(mActivity.getString(R.string.power_screen), DrainType.SCREEN, screenOnTimeMs,
-                R.drawable.ic_settings_display, power);
-    }
-
-    private void addRadioUsage(long uSecNow) {
-        double power = 0;
-        final int BINS = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
-        long signalTimeMs = 0;
-        for (int i = 0; i < BINS; i++) {
-            long strengthTimeMs = mStats.getPhoneSignalStrengthTime(i, uSecNow, mStatsType) / 1000;
-            power += strengthTimeMs / 1000
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ON, i);
-            signalTimeMs += strengthTimeMs;
-        }
-        long scanningTimeMs = mStats.getPhoneSignalScanningTime(uSecNow, mStatsType) / 1000;
-        power += scanningTimeMs / 1000 * mPowerProfile.getAveragePower(
-                PowerProfile.POWER_RADIO_SCANNING);
-        BatterySipper bs =
-                addEntry(mActivity.getString(R.string.power_cell), DrainType.CELL,
-                        signalTimeMs, R.drawable.ic_settings_cell_standby, power);
-        if (signalTimeMs != 0) {
-            bs.noCoveragePercent = mStats.getPhoneSignalStrengthTime(0, uSecNow, mStatsType)
-                    / 1000 * 100.0 / signalTimeMs;
-        }
-    }
-
-    private void aggregateSippers(BatterySipper bs, List<BatterySipper> from, String tag) {
-        for (int i=0; i<from.size(); i++) {
-            BatterySipper wbs = from.get(i);
-            if (DEBUG) Log.i(TAG, tag + " adding sipper " + wbs + ": cpu=" + wbs.cpuTime);
-            bs.cpuTime += wbs.cpuTime;
-            bs.gpsTime += wbs.gpsTime;
-            bs.wifiRunningTime += wbs.wifiRunningTime;
-            bs.cpuFgTime += wbs.cpuFgTime;
-            bs.wakeLockTime += wbs.wakeLockTime;
-            bs.mobileRxPackets += wbs.mobileRxPackets;
-            bs.mobileTxPackets += wbs.mobileTxPackets;
-            bs.wifiRxPackets += wbs.wifiRxPackets;
-            bs.wifiTxPackets += wbs.wifiTxPackets;
-            bs.mobileRxBytes += wbs.mobileRxBytes;
-            bs.mobileTxBytes += wbs.mobileTxBytes;
-            bs.wifiRxBytes += wbs.wifiRxBytes;
-            bs.wifiTxBytes += wbs.wifiTxBytes;
-        }
-    }
-
-    private void addWiFiUsage(long uSecNow) {
-        long onTimeMs = mStats.getWifiOnTime(uSecNow, mStatsType) / 1000;
-        long runningTimeMs = mStats.getGlobalWifiRunningTime(uSecNow, mStatsType) / 1000;
-        if (DEBUG) Log.i(TAG, "WIFI runningTime=" + runningTimeMs
-                + " app runningTime=" + mAppWifiRunning);
-        runningTimeMs -= mAppWifiRunning;
-        if (runningTimeMs < 0) runningTimeMs = 0;
-        double wifiPower = (onTimeMs * 0 /* TODO */
-                * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)
-            + runningTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
-        if (DEBUG) Log.i(TAG, "WIFI power=" + wifiPower + " from procs=" + mWifiPower);
-        BatterySipper bs = addEntry(mActivity.getString(R.string.power_wifi), DrainType.WIFI,
-                runningTimeMs, R.drawable.ic_settings_wifi, wifiPower + mWifiPower);
-        aggregateSippers(bs, mWifiSippers, "WIFI");
-    }
-
-    private void addIdleUsage(long uSecNow) {
-        long idleTimeMs = (uSecNow - mStats.getScreenOnTime(uSecNow, mStatsType)) / 1000;
-        double idlePower = (idleTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_IDLE))
-                / 1000;
-        addEntry(mActivity.getString(R.string.power_idle), DrainType.IDLE, idleTimeMs,
-                R.drawable.ic_settings_phone_idle, idlePower);
-    }
-
-    private void addBluetoothUsage(long uSecNow) {
-        long btOnTimeMs = mStats.getBluetoothOnTime(uSecNow, mStatsType) / 1000;
-        double btPower = btOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_ON)
-                / 1000;
-        int btPingCount = mStats.getBluetoothPingCount();
-        btPower += (btPingCount
-                * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_AT_CMD)) / 1000;
-        BatterySipper bs = addEntry(mActivity.getString(R.string.power_bluetooth),
-                DrainType.BLUETOOTH, btOnTimeMs, R.drawable.ic_settings_bluetooth,
-                btPower + mBluetoothPower);
-        aggregateSippers(bs, mBluetoothSippers, "Bluetooth");
-    }
-
-    private void addUserUsage() {
-        for (int i=0; i<mUserSippers.size(); i++) {
-            final int userId = mUserSippers.keyAt(i);
-            final List<BatterySipper> sippers = mUserSippers.valueAt(i);
-            UserInfo info = mUm.getUserInfo(userId);
-            Drawable icon;
-            String name;
-            if (info != null) {
-                icon = UserUtils.getUserIcon(mActivity, mUm, info, mActivity.getResources());
-                name = info != null ? info.name : null;
-                if (name == null) {
-                    name = Integer.toString(info.id);
-                }
-                name = mActivity.getResources().getString(
-                        R.string.running_process_item_user_label, name);
-            } else {
-                icon = null;
-                name = mActivity.getResources().getString(
-                        R.string.running_process_item_removed_user_label);
-            }
-            Double userPower = mUserPower.get(userId);
-            double power = (userPower != null) ? userPower : 0.0;
-            BatterySipper bs = addEntry(name, DrainType.USER, 0, 0, power);
-            bs.icon = icon;
-            aggregateSippers(bs, sippers, "User");
-        }
-    }
-
-    /**
-     * Return estimated power (in mAs) of sending or receiving a packet with the mobile radio.
-     */
-    private double getMobilePowerPerPacket() {
-        final long MOBILE_BPS = 200000; // TODO: Extract average bit rates from system
-        final double MOBILE_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
-                / 3600;
-
-        final long mobileRx = mStats.getNetworkActivityPackets(NETWORK_MOBILE_RX_DATA, mStatsType);
-        final long mobileTx = mStats.getNetworkActivityPackets(NETWORK_MOBILE_TX_DATA, mStatsType);
-        final long mobileData = mobileRx + mobileTx;
-
-        final long radioDataUptimeMs = mStats.getRadioDataUptime() / 1000;
-        final double mobilePps = radioDataUptimeMs != 0
-                ? mobileData / (double)radioDataUptimeMs
-                : (((double)MOBILE_BPS) / 8 / 2048);
-
-        return MOBILE_POWER / mobilePps;
-    }
-
-    /**
-     * Return estimated power (in mAs) of sending a byte with the Wi-Fi radio.
-     */
-    private double getWifiPowerPerPacket() {
-        final long WIFI_BPS = 1000000; // TODO: Extract average bit rates from system
-        final double WIFI_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ACTIVE)
-                / 3600;
-        return WIFI_POWER / (((double)WIFI_BPS) / 8 / 2048);
-    }
-
-    private void processMiscUsage() {
-        final int which = mStatsType;
-        long uSecTime = SystemClock.elapsedRealtime() * 1000;
-        final long uSecNow = mStats.computeBatteryRealtime(uSecTime, which);
-        final long timeSinceUnplugged = uSecNow;
-        if (DEBUG) {
-            Log.i(TAG, "Uptime since last unplugged = " + (timeSinceUnplugged / 1000));
-        }
-
-        addUserUsage();
-        addPhoneUsage(uSecNow);
-        addScreenUsage(uSecNow);
-        addWiFiUsage(uSecNow);
-        addBluetoothUsage(uSecNow);
-        addIdleUsage(uSecNow); // Not including cellular idle power
-        // Don't compute radio usage if it's a wifi-only device
-        if (!com.android.settings.Utils.isWifiOnly(mActivity)) {
-            addRadioUsage(uSecNow);
-        }
-    }
-
-    private BatterySipper addEntry(String label, DrainType drainType, long time, int iconId,
-            double power) {
-        mTotalPower += power;
-        return addEntryNoTotal(label, drainType, time, iconId, power);
-    }
-
-    private BatterySipper addEntryNoTotal(String label, DrainType drainType, long time, int iconId,
-            double power) {
-        if (power > mMaxPower) mMaxPower = power;
-        mTotalPower += power;
-        BatterySipper bs = new BatterySipper(mActivity, mRequestQueue, mHandler,
-                label, drainType, iconId, null, new double[] {power});
-        bs.usageTime = time;
-        bs.iconId = iconId;
-        mUsageList.add(bs);
-        return bs;
-    }
-
-    public List<BatterySipper> getUsageList() {
-        return mUsageList;
-    }
-
-    static final int MSG_UPDATE_NAME_ICON = 1;
-    static final int MSG_REPORT_FULLY_DRAWN = 2;
-
-    public double getMaxPower() {
-        return mMaxPower;
-    }
-
-    public double getTotalPower() {
-        return mTotalPower;
-    }
-
-    public double getMinDrainedPower() {
-        return mMinDrainedPower;
-    }
-
-    public double getMaxDrainedPower() {
-        return mMaxDrainedPower;
-    }
-
-    private void load() {
-        try {
-            byte[] data = mBatteryInfo.getStatistics();
-            Parcel parcel = Parcel.obtain();
-            parcel.unmarshall(data, 0, data.length);
-            parcel.setDataPosition(0);
-            mStats = com.android.internal.os.BatteryStatsImpl.CREATOR
-                    .createFromParcel(parcel);
-            mStats.distributeWorkLocked(BatteryStats.STATS_SINCE_CHARGED);
-        } catch (RemoteException e) {
-            Log.e(TAG, "RemoteException:", e);
-        }
-    }
-}
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index c8bfa21..e10b74f 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -24,6 +24,7 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.android.internal.os.BatterySipper;
 import com.android.settings.R;
 
 /**
@@ -31,11 +32,11 @@
  * the left for the subsystem/app type.
  */
 public class PowerGaugePreference extends Preference {
-    private BatterySipper mInfo;
+    private BatteryEntry mInfo;
     private int mProgress;
     private CharSequence mProgressText;
 
-    public PowerGaugePreference(Context context, Drawable icon, BatterySipper info) {
+    public PowerGaugePreference(Context context, Drawable icon, BatteryEntry info) {
         super(context);
         setLayoutResource(R.layout.app_percentage_item);
         setIcon(icon != null ? icon : new ColorDrawable(0));
@@ -49,7 +50,7 @@
         notifyChanged();
     }
 
-    BatterySipper getInfo() {
+    BatteryEntry getInfo() {
         return mInfo;
     }
 
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 79b7c42..6a3a31b 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -34,13 +34,13 @@
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.BatteryStats;
 import android.os.Bundle;
 import android.os.Process;
 import android.os.UserHandle;
 import android.preference.PreferenceActivity;
 import android.provider.Settings;
 import android.text.TextUtils;
-import android.text.format.Formatter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -49,6 +49,9 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.internal.util.FastPrintWriter;
 import com.android.settings.DisplaySettings;
 import com.android.settings.R;
 import com.android.settings.WirelessSettings;
@@ -57,20 +60,11 @@
 import com.android.settings.location.LocationSettings;
 import com.android.settings.wifi.WifiSettings;
 
-public class PowerUsageDetail extends Fragment implements Button.OnClickListener {
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
 
-    enum DrainType {
-        IDLE,
-        CELL,
-        PHONE,
-        WIFI,
-        BLUETOOTH,
-        SCREEN,
-        APP,
-        USER,
-        UNACCOUNTED,
-        OVERCOUNTED
-    }
+public class PowerUsageDetail extends Fragment implements Button.OnClickListener {
 
     // Note: Must match the sequence of the DrainType
     private static int[] sDrainTypeDesciptions = new int[] {
@@ -86,6 +80,170 @@
         R.string.battery_desc_overcounted,
     };
 
+    public static void startBatteryDetailPage(
+            PreferenceActivity caller, BatteryStatsHelper helper, BatteryEntry entry,
+            boolean showLocationButton) {
+        // Initialize mStats if necessary.
+        helper.getStats();
+
+        Bundle args = new Bundle();
+        args.putString(PowerUsageDetail.EXTRA_TITLE, entry.name);
+        args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int)
+                Math.ceil(entry.sipper.value * 100 / helper.getTotalPower()));
+        args.putInt(PowerUsageDetail.EXTRA_GAUGE, (int)
+                Math.ceil(entry.sipper.value * 100 / helper.getMaxPower()));
+        args.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, helper.getStatsPeriod());
+        args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, entry.defaultPackageName);
+        args.putInt(PowerUsageDetail.EXTRA_ICON_ID, entry.iconId);
+        args.putDouble(PowerUsageDetail.EXTRA_NO_COVERAGE, entry.sipper.noCoveragePercent);
+        if (entry.sipper.uidObj != null) {
+            args.putInt(PowerUsageDetail.EXTRA_UID, entry.sipper.uidObj.getUid());
+        }
+        args.putSerializable(PowerUsageDetail.EXTRA_DRAIN_TYPE, entry.sipper.drainType);
+        args.putBoolean(PowerUsageDetail.EXTRA_SHOW_LOCATION_BUTTON, showLocationButton);
+
+        int[] types;
+        double[] values;
+        switch (entry.sipper.drainType) {
+            case APP:
+            case USER:
+            {
+                BatteryStats.Uid uid = entry.sipper.uidObj;
+                types = new int[] {
+                    R.string.usage_type_cpu,
+                    R.string.usage_type_cpu_foreground,
+                    R.string.usage_type_wake_lock,
+                    R.string.usage_type_gps,
+                    R.string.usage_type_wifi_running,
+                    R.string.usage_type_data_recv,
+                    R.string.usage_type_data_send,
+                    R.string.usage_type_data_wifi_recv,
+                    R.string.usage_type_data_wifi_send,
+                    R.string.usage_type_audio,
+                    R.string.usage_type_video,
+                };
+                values = new double[] {
+                    entry.sipper.cpuTime,
+                    entry.sipper.cpuFgTime,
+                    entry.sipper.wakeLockTime,
+                    entry.sipper.gpsTime,
+                    entry.sipper.wifiRunningTime,
+                    entry.sipper.mobileRxPackets,
+                    entry.sipper.mobileTxPackets,
+                    entry.sipper.wifiRxPackets,
+                    entry.sipper.wifiTxPackets,
+                    0,
+                    0
+                };
+
+                if (entry.sipper.drainType == BatterySipper.DrainType.APP) {
+                    Writer result = new StringWriter();
+                    PrintWriter printWriter = new FastPrintWriter(result, false, 1024);
+                    helper.getStats().dumpLocked(caller, printWriter, "", helper.getStatsType(),
+                            uid.getUid());
+                    printWriter.flush();
+                    args.putString(PowerUsageDetail.EXTRA_REPORT_DETAILS, result.toString());
+
+                    result = new StringWriter();
+                    printWriter = new FastPrintWriter(result, false, 1024);
+                    helper.getStats().dumpCheckinLocked(caller, printWriter, helper.getStatsType(),
+                            uid.getUid());
+                    printWriter.flush();
+                    args.putString(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS,
+                            result.toString());
+                }
+            }
+            break;
+            case CELL:
+            {
+                types = new int[] {
+                    R.string.usage_type_on_time,
+                    R.string.usage_type_no_coverage
+                };
+                values = new double[] {
+                    entry.sipper.usageTime,
+                    entry.sipper.noCoveragePercent
+                };
+            }
+            break;
+            case WIFI:
+            {
+                types = new int[] {
+                    R.string.usage_type_wifi_running,
+                    R.string.usage_type_cpu,
+                    R.string.usage_type_cpu_foreground,
+                    R.string.usage_type_wake_lock,
+                    R.string.usage_type_data_recv,
+                    R.string.usage_type_data_send,
+                    R.string.usage_type_data_wifi_recv,
+                    R.string.usage_type_data_wifi_send,
+                };
+                values = new double[] {
+                    entry.sipper.usageTime,
+                    entry.sipper.cpuTime,
+                    entry.sipper.cpuFgTime,
+                    entry.sipper.wakeLockTime,
+                    entry.sipper.mobileRxPackets,
+                    entry.sipper.mobileTxPackets,
+                    entry.sipper.wifiRxPackets,
+                    entry.sipper.wifiTxPackets,
+                };
+            } break;
+            case BLUETOOTH:
+            {
+                types = new int[] {
+                    R.string.usage_type_on_time,
+                    R.string.usage_type_cpu,
+                    R.string.usage_type_cpu_foreground,
+                    R.string.usage_type_wake_lock,
+                    R.string.usage_type_data_recv,
+                    R.string.usage_type_data_send,
+                    R.string.usage_type_data_wifi_recv,
+                    R.string.usage_type_data_wifi_send,
+                };
+                values = new double[] {
+                    entry.sipper.usageTime,
+                    entry.sipper.cpuTime,
+                    entry.sipper.cpuFgTime,
+                    entry.sipper.wakeLockTime,
+                    entry.sipper.mobileRxPackets,
+                    entry.sipper.mobileTxPackets,
+                    entry.sipper.wifiRxPackets,
+                    entry.sipper.wifiTxPackets,
+                };
+            } break;
+            case UNACCOUNTED:
+            case OVERCOUNTED:
+            {
+                types = new int[] {
+                    R.string.usage_type_total_battery_capacity,
+                    R.string.usage_type_computed_power,
+                    R.string.usage_type_min_actual_power,
+                    R.string.usage_type_max_actual_power,
+                };
+                values = new double[] {
+                    helper.getPowerProfile().getBatteryCapacity(),
+                    helper.getTotalPower(),
+                    helper.getMinDrainedPower(),
+                    helper.getMaxDrainedPower(),
+                };
+            } break;
+            default:
+            {
+                types = new int[] {
+                    R.string.usage_type_on_time
+                };
+                values = new double[] {
+                    entry.sipper.usageTime
+                };
+            }
+        }
+        args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
+        args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
+        caller.startPreferencePanel(PowerUsageDetail.class.getName(), args,
+                R.string.details_title, null, null, 0);
+    }
+
     public static final int ACTION_DISPLAY_SETTINGS = 1;
     public static final int ACTION_WIFI_SETTINGS = 2;
     public static final int ACTION_BLUETOOTH_SETTINGS = 3;
@@ -129,7 +287,7 @@
     private ViewGroup mDetailsParent;
     private ViewGroup mControlsParent;
     private long mStartTime;
-    private DrainType mDrainType;
+    private BatterySipper.DrainType mDrainType;
     private Drawable mAppIcon;
     private double mNoCoverage; // Percentage of time that there was no coverage
 
@@ -179,7 +337,7 @@
         final int gaugeValue = args.getInt(EXTRA_GAUGE, 1);
         mUsageSince = args.getInt(EXTRA_USAGE_SINCE, USAGE_SINCE_UNPLUGGED);
         mUid = args.getInt(EXTRA_UID, 0);
-        mDrainType = (DrainType) args.getSerializable(EXTRA_DRAIN_TYPE);
+        mDrainType = (BatterySipper.DrainType) args.getSerializable(EXTRA_DRAIN_TYPE);
         mNoCoverage = args.getDouble(EXTRA_NO_COVERAGE, 0);
         String iconPackage = args.getString(EXTRA_ICON_PACKAGE);
         int iconId = args.getInt(EXTRA_ICON_ID, 0);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 2c78375..06aff2e 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -26,6 +26,8 @@
 import android.os.Handler;
 import android.os.Message;
 import android.os.Parcel;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
@@ -36,6 +38,8 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
 import com.android.internal.os.PowerProfile;
 import com.android.settings.HelpUtils;
 import com.android.settings.R;
@@ -59,6 +63,8 @@
     private static final int MENU_STATS_REFRESH = Menu.FIRST + 1;
     private static final int MENU_HELP = Menu.FIRST + 2;
 
+    private UserManager mUm;
+
     private PreferenceGroup mAppListGroup;
     private String mBatteryLevel;
     private String mBatteryStatus;
@@ -87,7 +93,8 @@
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
-        mStatsHelper = new BatteryStatsHelper(activity, mHandler);
+        mUm = (UserManager) activity.getSystemService(Context.USER_SERVICE);
+        mStatsHelper = new BatteryStatsHelper(activity);
     }
 
     @Override
@@ -111,8 +118,8 @@
 
     @Override
     public void onPause() {
-        mStatsHelper.pause();
-        mHandler.removeMessages(BatteryStatsHelper.MSG_UPDATE_NAME_ICON);
+        BatteryEntry.stopRequestQueue();
+        mHandler.removeMessages(BatteryEntry.MSG_UPDATE_NAME_ICON);
         getActivity().unregisterReceiver(mBatteryInfoReceiver);
         super.onPause();
     }
@@ -120,7 +127,10 @@
     @Override
     public void onDestroy() {
         super.onDestroy();
-        mStatsHelper.destroy();
+        if (getActivity().isChangingConfigurations()) {
+            mStatsHelper.storeState();
+            BatteryEntry.clearUidCache();
+        }
     }
 
     @Override
@@ -140,8 +150,9 @@
             return false;
         }
         PowerGaugePreference pgp = (PowerGaugePreference) preference;
-        BatterySipper sipper = pgp.getInfo();
-        mStatsHelper.startBatteryDetailPage((PreferenceActivity) getActivity(), sipper, true);
+        BatteryEntry entry = pgp.getInfo();
+        PowerUsageDetail.startBatteryDetailPage((PreferenceActivity) getActivity(), mStatsHelper,
+                entry, true);
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
@@ -227,20 +238,22 @@
             addNotAvailableMessage();
             return;
         }
-        mStatsHelper.refreshStats(false);
+        mStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, UserHandle.myUserId());
         List<BatterySipper> usageList = mStatsHelper.getUsageList();
-        for (BatterySipper sipper : usageList) {
-            if (sipper.getSortValue() < MIN_POWER_THRESHOLD) continue;
+        for (int i=0; i<usageList.size(); i++) {
+            BatterySipper sipper = usageList.get(i);
+            if ((sipper.value*60*60) < MIN_POWER_THRESHOLD) continue;
             final double percentOfTotal =
-                    ((sipper.getSortValue() / mStatsHelper.getTotalPower()) * 100);
+                    ((sipper.value / mStatsHelper.getTotalPower()) * 100);
             if (percentOfTotal < 1) continue;
+            BatteryEntry entry = new BatteryEntry(getActivity(), mHandler, mUm, sipper);
             PowerGaugePreference pref =
-                    new PowerGaugePreference(getActivity(), sipper.getIcon(), sipper);
+                    new PowerGaugePreference(getActivity(), entry.getIcon(), entry);
             final double percentOfMax =
-                    (sipper.getSortValue() * 100) / mStatsHelper.getMaxPower();
+                    (sipper.value * 100) / mStatsHelper.getMaxPower();
             sipper.percent = percentOfTotal;
-            pref.setTitle(sipper.name);
-            pref.setOrder(Integer.MAX_VALUE - (int) sipper.getSortValue()); // Invert the order
+            pref.setTitle(entry.getLabel());
+            pref.setOrder(i+1);
             pref.setPercent(percentOfMax, percentOfTotal);
             if (sipper.uidObj != null) {
                 pref.setKey(Integer.toString(sipper.uidObj.getUid()));
@@ -248,6 +261,8 @@
             mAppListGroup.addPreference(pref);
             if (mAppListGroup.getPreferenceCount() > (MAX_ITEMS_TO_LIST+1)) break;
         }
+
+        BatteryEntry.startRequestQueue();
     }
 
     Handler mHandler = new Handler() {
@@ -255,17 +270,17 @@
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
-                case BatteryStatsHelper.MSG_UPDATE_NAME_ICON:
-                    BatterySipper bs = (BatterySipper) msg.obj;
+                case BatteryEntry.MSG_UPDATE_NAME_ICON:
+                    BatteryEntry entry = (BatteryEntry) msg.obj;
                     PowerGaugePreference pgp =
                             (PowerGaugePreference) findPreference(
-                                    Integer.toString(bs.uidObj.getUid()));
+                                    Integer.toString(entry.sipper.uidObj.getUid()));
                     if (pgp != null) {
-                        pgp.setIcon(bs.icon);
-                        pgp.setTitle(bs.name);
+                        pgp.setIcon(entry.icon);
+                        pgp.setTitle(entry.name);
                     }
                     break;
-                case BatteryStatsHelper.MSG_REPORT_FULLY_DRAWN:
+                case BatteryEntry.MSG_REPORT_FULLY_DRAWN:
                     Activity activity = getActivity();
                     if (activity != null) {
                         activity.reportFullyDrawn();